Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=27adb4... Commit: 27adb44c4f671d15932eb0702a09d27244a8a7c1 Parent: 4ca691a892e8ab4f79583de1394f17a7dcfa2b57 Author: Steve French <sfrench@us.ibm.com> AuthorDate: Fri May 23 19:43:29 2008 +0000 Committer: Steve French <sfrench@us.ibm.com> CommitDate: Fri May 23 19:43:29 2008 +0000 [CIFS] warn if both dynperm and cifsacl mount options specified Signed-off-by: Steve French <sfrench@us.ibm.com> --- fs/cifs/connect.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 023434f..d49e274 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); -- To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
