From 04721b86b5a344a17d17e836fcfe214e0fa210d6 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Fri, 23 May 2008 19:43:29 +0000
Subject: [PATCH] --- yaml --- r: 97962 b: refs/heads/master c:
 27adb44c4f671d15932eb0702a09d27244a8a7c1 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b0175c86106..584063bc0f33 100644
--- 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
index 023434f72c15..d49e274f8eba 100644
--- 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);