1 files changed, 7 insertions, 6 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index fb7c11c2c913..f2e285457bee 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -166,8 +166,9 @@ cifs_put_super(struct super_block *sb)
 }
 
 static int
-cifs_statfs(struct super_block *sb, struct kstatfs *buf)
+cifs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
+        struct super_block *sb = dentry->d_sb;
         int xid; 
         int rc = -EOPNOTSUPP;
         struct cifs_sb_info *cifs_sb;
@@ -460,9 +461,9 @@ struct super_operations cifs_super_ops = {
         .remount_fs = cifs_remount,
 };
 
-static struct super_block *
+static int
 cifs_get_sb(struct file_system_type *fs_type,
-            int flags, const char *dev_name, void *data)
+            int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 {
         int rc;
         struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL);
@@ -470,7 +471,7 @@ cifs_get_sb(struct file_system_type *fs_type,
         cFYI(1, ("Devname: %s flags: %d ", dev_name, flags));
 
         if (IS_ERR(sb))
-                return sb;
+                return PTR_ERR(sb);
 
         sb->s_flags = flags;
 
@@ -478,10 +479,10 @@ cifs_get_sb(struct file_system_type *fs_type,
         if (rc) {
                 up_write(&sb->s_umount);
                 deactivate_super(sb);
-                return ERR_PTR(rc);
+                return rc;
         }
         sb->s_flags |= MS_ACTIVE;
-        return sb;
+        return simple_set_mnt(mnt, sb);
 }
 
 static ssize_t cifs_file_writev(struct file *file, const struct iovec *iov,