diff options
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c262d8874ce9..08b35801dfed 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -460,9 +460,9 @@ struct super_operations cifs_super_ops = { | |||
460 | .remount_fs = cifs_remount, | 460 | .remount_fs = cifs_remount, |
461 | }; | 461 | }; |
462 | 462 | ||
463 | static struct super_block * | 463 | static int |
464 | cifs_get_sb(struct file_system_type *fs_type, | 464 | cifs_get_sb(struct file_system_type *fs_type, |
465 | int flags, const char *dev_name, void *data) | 465 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
466 | { | 466 | { |
467 | int rc; | 467 | int rc; |
468 | struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); | 468 | struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); |
@@ -470,7 +470,7 @@ cifs_get_sb(struct file_system_type *fs_type, | |||
470 | cFYI(1, ("Devname: %s flags: %d ", dev_name, flags)); | 470 | cFYI(1, ("Devname: %s flags: %d ", dev_name, flags)); |
471 | 471 | ||
472 | if (IS_ERR(sb)) | 472 | if (IS_ERR(sb)) |
473 | return sb; | 473 | return PTR_ERR(sb); |
474 | 474 | ||
475 | sb->s_flags = flags; | 475 | sb->s_flags = flags; |
476 | 476 | ||
@@ -478,10 +478,10 @@ cifs_get_sb(struct file_system_type *fs_type, | |||
478 | if (rc) { | 478 | if (rc) { |
479 | up_write(&sb->s_umount); | 479 | up_write(&sb->s_umount); |
480 | deactivate_super(sb); | 480 | deactivate_super(sb); |
481 | return ERR_PTR(rc); | 481 | return rc; |
482 | } | 482 | } |
483 | sb->s_flags |= MS_ACTIVE; | 483 | sb->s_flags |= MS_ACTIVE; |
484 | return sb; | 484 | return simple_set_mnt(mnt, sb); |
485 | } | 485 | } |
486 | 486 | ||
487 | static ssize_t cifs_file_writev(struct file *file, const struct iovec *iov, | 487 | static ssize_t cifs_file_writev(struct file *file, const struct iovec *iov, |