From aa9eaf771c37639f37bbdd76e3c2cdea7a95a2e6 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 15 Feb 2008 19:06:04 +0000 Subject: [PATCH] --- yaml --- r: 86699 b: refs/heads/master c: 11b6d6450c10066e83e19f6ff57d55678c3e9f13 h: refs/heads/master i: 86697: 82c9e65bb819d8fd1dffdd4ff97bc5e5cf4c6d03 86695: 8f04c409edf0ea56091833d565c8aebd61da6a10 v: v3 --- [refs] | 2 +- trunk/fs/cifs/connect.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6513108b0421..12d83b5501dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aad018b6c1a0257b37cdf7c90cdbee2353150fd +refs/heads/master: 11b6d6450c10066e83e19f6ff57d55678c3e9f13 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index e111c69139b7..77e6c4c3a88b 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1722,8 +1722,15 @@ void reset_cifs_unix_caps(int xid, struct cifsTconInfo *tcon, originally at mount time */ if ((saved_cap & CIFS_UNIX_POSIX_ACL_CAP) == 0) cap &= ~CIFS_UNIX_POSIX_ACL_CAP; - if ((saved_cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) == 0) + if ((saved_cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) == 0) { + if (cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) + cERROR(1, ("POSIXPATH support change")); cap &= ~CIFS_UNIX_POSIX_PATHNAMES_CAP; + } else if ((cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) == 0) { + cERROR(1, ("possible reconnect error")); + cERROR(1, + ("server disabled POSIX path support")); + } } cap &= CIFS_UNIX_CAP_MASK; @@ -2243,7 +2250,9 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, tcon->unix_ext = 0; /* server does not support them */ /* convert forward to back slashes in prepath here if needed */ - convert_delimiter(cifs_sb->prepath, CIFS_DIR_SEP(cifs_sb)); + if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) == 0) + convert_delimiter(cifs_sb->prepath, + CIFS_DIR_SEP(cifs_sb)); if ((tcon->unix_ext == 0) && (cifs_sb->rsize > (1024 * 127))) { cifs_sb->rsize = 1024 * 127;