diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-02-15 19:06:04 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 19:06:04 +0000 |
| commit | 11b6d6450c10066e83e19f6ff57d55678c3e9f13 (patch) | |
| tree | 579afbcdaaf2b0ff175e2fd2463ad562de227b3d /fs/cifs/connect.c | |
| parent | 8aad018b6c1a0257b37cdf7c90cdbee2353150fd (diff) | |
| download | linux-11b6d6450c10066e83e19f6ff57d55678c3e9f13.tar.bz2 | |
[CIFS] Only convert / when server does not support posix paths
Also add warning if posix path setting changes on reconnect
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e111c69139b7..77e6c4c3a88b 100644 --- a/fs/cifs/connect.c +++ b/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; |