diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2017-04-26 15:05:46 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-04-28 14:54:54 +0200 |
| commit | cd8c42968ee651b69e00f8661caff32b0086e82d (patch) | |
| tree | 011ff7ece75e8dbb6a92674d0419069c7f97b95b /fs/cifs/connect.c | |
| parent | Merge tag 'ceph-for-4.11-rc9' of git://github.com/ceph/ceph-client (diff) | |
| download | linux-cd8c42968ee651b69e00f8661caff32b0086e82d.tar.xz linux-cd8c42968ee651b69e00f8661caff32b0086e82d.zip | |
Fix match_prepath()
Incorrect return value for shares not using the prefix path means that
we will never match superblocks for these shares.
Fixes: commit c1d8b24d1819 ("Compare prepaths when comparing superblocks")
Cc: stable@vger.kernel.org
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d82467cfb0e2..d95744d8b8ab 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2912,16 +2912,14 @@ match_prepath(struct super_block *sb, struct cifs_mnt_data *mnt_data) { struct cifs_sb_info *old = CIFS_SB(sb); struct cifs_sb_info *new = mnt_data->cifs_sb; + bool old_set = old->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH; + bool new_set = new->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH; - if (old->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH) { - if (!(new->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH)) - return 0; - /* The prepath should be null terminated strings */ - if (strcmp(new->prepath, old->prepath)) - return 0; - + if (old_set && new_set && !strcmp(new->prepath, old->prepath)) return 1; - } + else if (!old_set && !new_set) + return 1; + return 0; } |