summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-23 23:43:29 +0400
committerSteve French <sfrench@us.ibm.com>2008-05-23 23:43:29 +0400
commit27adb44c4f671d15932eb0702a09d27244a8a7c1 (patch)
tree0ccc6e506a9ed7e85c18bec6c3603a9a257e6786 /fs
parent4ca691a892e8ab4f79583de1394f17a7dcfa2b57 (diff)
downloadlinux-27adb44c4f671d15932eb0702a09d27244a8a7c1.tar.xz
[CIFS] warn if both dynperm and cifsacl mount options specified
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/connect.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 023434f72c15..d49e274f8eba 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);