From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp1040.oracle.com ([141.146.126.69]:39864 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755012AbdCTVAq (ORCPT ); Mon, 20 Mar 2017 17:00:46 -0400 Date: Mon, 20 Mar 2017 14:00:00 -0700 From: Liu Bo To: David Sterba Cc: linux-btrfs@vger.kernel.org Subject: Re: [PATCH 4/7] btrfs: remove redundant parameter from btree_readahead_hook Message-ID: <20170320210000.GG5540@lim.localdomain> Reply-To: bo.li.liu@oracle.com References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: Sender: linux-btrfs-owner@vger.kernel.org List-ID: On Wed, Mar 15, 2017 at 05:02:33PM +0100, David Sterba wrote: > We can read fs_info from eb. Reviewed-by: Liu Bo Thanks, -liubo > > Signed-off-by: David Sterba > --- > fs/btrfs/ctree.h | 3 +-- > fs/btrfs/disk-io.c | 4 ++-- > fs/btrfs/reada.c | 4 ++-- > 3 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h > index 29b7fc28c607..173fac68323a 100644 > --- a/fs/btrfs/ctree.h > +++ b/fs/btrfs/ctree.h > @@ -3671,8 +3671,7 @@ struct reada_control *btrfs_reada_add(struct btrfs_root *root, > struct btrfs_key *start, struct btrfs_key *end); > int btrfs_reada_wait(void *handle); > void btrfs_reada_detach(void *handle); > -int btree_readahead_hook(struct btrfs_fs_info *fs_info, > - struct extent_buffer *eb, int err); > +int btree_readahead_hook(struct extent_buffer *eb, int err); > > static inline int is_fstree(u64 rootid) > { > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 1d4c30327247..995b28179af9 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -762,7 +762,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, > err: > if (reads_done && > test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags)) > - btree_readahead_hook(fs_info, eb, ret); > + btree_readahead_hook(eb, ret); > > if (ret) { > /* > @@ -787,7 +787,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror) > eb->read_mirror = failed_mirror; > atomic_dec(&eb->io_pages); > if (test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags)) > - btree_readahead_hook(eb->fs_info, eb, -EIO); > + btree_readahead_hook(eb, -EIO); > return -EIO; /* we fixed nothing */ > } > > diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c > index 4c5a9b241cab..5edf7328f67d 100644 > --- a/fs/btrfs/reada.c > +++ b/fs/btrfs/reada.c > @@ -209,9 +209,9 @@ static void __readahead_hook(struct btrfs_fs_info *fs_info, > return; > } > > -int btree_readahead_hook(struct btrfs_fs_info *fs_info, > - struct extent_buffer *eb, int err) > +int btree_readahead_hook(struct extent_buffer *eb, int err) > { > + struct btrfs_fs_info *fs_info = eb->fs_info; > int ret = 0; > struct reada_extent *re; > > -- > 2.12.0 > > -- > 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