Recent patches reworking the mount path left some unused parameters. We
pass a vfsmount to mount_subvol, the flags and data (ie. mount options)
have been already applied and we will not need them.

Signed-off-by: David Sterba <dste...@suse.com>
---
 fs/btrfs/super.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index a35ac567384a..1434f288a397 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1395,8 +1395,7 @@ static inline int is_subvolume_inode(struct inode *inode)
 }
 
 static struct dentry *mount_subvol(const char *subvol_name, u64 
subvol_objectid,
-                                  int flags, const char *device_name,
-                                  char *data, struct vfsmount *mnt)
+                                  const char *device_name, struct vfsmount 
*mnt)
 {
        struct dentry *root;
        int ret;
@@ -1691,8 +1690,7 @@ static struct dentry *btrfs_mount(struct file_system_type 
*fs_type, int flags,
        }
 
        /* mount_subvol() will free subvol_name and mnt_root */
-       root = mount_subvol(subvol_name, subvol_objectid, flags, device_name,
-                       data, mnt_root);
+       root = mount_subvol(subvol_name, subvol_objectid, device_name, 
mnt_root);
 
 out:
        return root;
-- 
2.15.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to