---

yaml --- r: 97962 b: refs/heads/master c: 27adb44 h: refs/heads/master v: v3
git-mirror · May 23, 2008 · 04721b8 · 04721b8
1 parent b347d0d
commit 04721b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ca691a892e8ab4f79583de1394f17a7dcfa2b57
+refs/heads/master: 27adb44c4f671d15932eb0702a09d27244a8a7c1
diff --git a/trunk/fs/cifs/connect.c b/trunk/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);