From: Steve French <sfrench@us.ibm.com>
Date: Fri, 23 May 2008 19:43:29 +0000 (+0000)
Subject: [CIFS] warn if both dynperm and cifsacl mount options specified
X-Git-Tag: v2.6.26-rc6~12^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=27adb44c4f671d15932eb0702a09d27244a8a7c1;p=linux-2.6-omap-h63xx.git

[CIFS] warn if both dynperm and cifsacl mount options specified

Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 023434f72c1..d49e274f8eb 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2120,6 +2120,10 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 			cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO;
 		}
 
+		if ((volume_info.cifs_acl) && (volume_info.dynperm))
+			cERROR(1, ("mount option dynperm ignored if cifsacl "
+				   "mount option supported"));
+
 		tcon =
 		    find_unc(sin_server.sin_addr.s_addr, volume_info.UNC,
 			     volume_info.username);