[v5,5/8] fs: xfs: replace BIO_MAX_SECTORS with BIO_MAX_PAGES
diff mbox

Message ID 1460928615-20894-6-git-send-email-ming.lei@canonical.com
State New
Headers show

Commit Message

Ming Lei April 17, 2016, 9:29 p.m. UTC
BIO_MAX_PAGES is used as maximum count of bvecs, so
replace BIO_MAX_SECTORS with BIO_MAX_PAGES since
BIO_MAX_SECTORS is to be removed.

Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
 fs/xfs/xfs_buf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Christoph Hellwig May 2, 2016, 2:57 p.m. UTC | #1
On Mon, Apr 18, 2016 at 05:29:54AM +0800, Ming Lei wrote:
> BIO_MAX_PAGES is used as maximum count of bvecs, so
> replace BIO_MAX_SECTORS with BIO_MAX_PAGES since
> BIO_MAX_SECTORS is to be removed.
> 
> Signed-off-by: Ming Lei <ming.lei@canonical.com>

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 9a2191b..b9ecb2d 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1161,9 +1161,7 @@  xfs_buf_ioapply_map(
 
 next_chunk:
 	atomic_inc(&bp->b_io_remaining);
-	nr_pages = BIO_MAX_SECTORS >> (PAGE_SHIFT - BBSHIFT);
-	if (nr_pages > total_nr_pages)
-		nr_pages = total_nr_pages;
+	nr_pages = min(total_nr_pages, BIO_MAX_PAGES);
 
 	bio = bio_alloc(GFP_NOIO, nr_pages);
 	bio->bi_bdev = bp->b_target->bt_bdev;