Message ID | a644ec1f6d10a61e4f0f5fcb313cf9d0894e9876.1486977712.git.dsterba@suse.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Mon, Feb 13, 2017 at 10:34:16AM +0100, David Sterba wrote: > Never used for anything meaningful since we have our own superblock > filler. > Looks good. Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Thanks, -liubo > Signed-off-by: David Sterba <dsterba@suse.com> > --- > fs/btrfs/super.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index 93ed29c2a38b..da687dc79cce 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -1114,7 +1114,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec > > static int btrfs_fill_super(struct super_block *sb, > struct btrfs_fs_devices *fs_devices, > - void *data, int silent) > + void *data) > { > struct inode *inode; > struct btrfs_fs_info *fs_info = btrfs_sb(sb); > @@ -1611,8 +1611,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, > } else { > snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); > btrfs_sb(s)->bdev_holder = fs_type; > - error = btrfs_fill_super(s, fs_devices, data, > - flags & MS_SILENT ? 1 : 0); > + error = btrfs_fill_super(s, fs_devices, data); > } > if (error) { > deactivate_locked_super(s); > -- > 2.10.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 93ed29c2a38b..da687dc79cce 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1114,7 +1114,7 @@ static int get_default_subvol_objectid(struct btrfs_fs_info *fs_info, u64 *objec static int btrfs_fill_super(struct super_block *sb, struct btrfs_fs_devices *fs_devices, - void *data, int silent) + void *data) { struct inode *inode; struct btrfs_fs_info *fs_info = btrfs_sb(sb); @@ -1611,8 +1611,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, } else { snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); btrfs_sb(s)->bdev_holder = fs_type; - error = btrfs_fill_super(s, fs_devices, data, - flags & MS_SILENT ? 1 : 0); + error = btrfs_fill_super(s, fs_devices, data); } if (error) { deactivate_locked_super(s);
Never used for anything meaningful since we have our own superblock filler. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/super.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)