diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2017-01-26 14:28:02 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-01-27 11:16:03 +0100 |
| commit | a6802847d7d7f5020eed1b41121ad77b5e539a4f (patch) | |
| tree | b7d02f5c3e94a8cb347ebe63566f1a3b1e00440e | |
| parent | a0ebbc68329db047bc1b9b9e263ad3e8cf16be4b (diff) | |
| download | linux-stable-a6802847d7d7f5020eed1b41121ad77b5e539a4f.tar.gz linux-stable-a6802847d7d7f5020eed1b41121ad77b5e539a4f.tar.bz2 linux-stable-a6802847d7d7f5020eed1b41121ad77b5e539a4f.zip | |
Move check for prefix path to within cifs_get_root()
commit 348c1bfa84dfc47da1f1234b7f2bf09fa798edea upstream.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Tested-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/cifs/cifsfs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 846b9916fdcd..75aacb731c54 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -586,6 +586,9 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb) char *s, *p; char sep; + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH) + return dget(sb->s_root); + full_path = cifs_build_path_to_root(vol, cifs_sb, cifs_sb_master_tcon(cifs_sb)); if (full_path == NULL) @@ -710,11 +713,7 @@ cifs_do_mount(struct file_system_type *fs_type, sb->s_flags |= MS_ACTIVE; } - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_USE_PREFIX_PATH) - root = dget(sb->s_root); - else - root = cifs_get_root(volume_info, sb); - + root = cifs_get_root(volume_info, sb); if (IS_ERR(root)) goto out_super; |