Skip to content

Commit

Permalink
btrfs: drop unused parameters from mount_subvol
Browse files Browse the repository at this point in the history
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 <dsterba@suse.com>
  • Loading branch information
David Sterba committed Jan 22, 2018
1 parent e215772 commit 5bedc48
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions fs/btrfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1397,8 +1397,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;
Expand Down Expand Up @@ -1693,8 +1692,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;
Expand Down

0 comments on commit 5bedc48

Please sign in to comment.