From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk0-f198.google.com (mail-qk0-f198.google.com [209.85.220.198]) by kanga.kvack.org (Postfix) with ESMTP id 08CCE6B04AE for ; Tue, 8 Aug 2017 04:51:51 -0400 (EDT) Received: by mail-qk0-f198.google.com with SMTP id d136so12867919qkg.11 for ; Tue, 08 Aug 2017 01:51:51 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id q10si836132qkh.96.2017.08.08.01.51.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Aug 2017 01:51:50 -0700 (PDT) From: Ming Lei Subject: [PATCH v3 29/49] fs/buffer.c: use bvec iterator to truncate the bio Date: Tue, 8 Aug 2017 16:45:28 +0800 Message-Id: <20170808084548.18963-30-ming.lei@redhat.com> In-Reply-To: <20170808084548.18963-1-ming.lei@redhat.com> References: <20170808084548.18963-1-ming.lei@redhat.com> Sender: owner-linux-mm@kvack.org List-ID: To: Jens Axboe , Christoph Hellwig , Huang Ying , Andrew Morton , Alexander Viro Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Ming Lei Once multipage bvec is enabled, the last bvec may include more than one page, this patch use bvec_get_last_page() to truncate the bio. Signed-off-by: Ming Lei --- fs/buffer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index c821ed6a6f0e..32a63e5b00f3 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -3057,8 +3057,7 @@ void guard_bio_eod(int op, struct bio *bio) unsigned truncated_bytes; /* * It is safe to truncate the last bvec in the following way - * even though multipage bvec is supported, but we need to - * fix the parameters passed to zero_user(). + * even though multipage bvec is supported. */ struct bio_vec *bvec = &bio->bi_io_vec[bio->bi_vcnt - 1]; @@ -3087,7 +3086,10 @@ void guard_bio_eod(int op, struct bio *bio) /* ..and clear the end of the buffer for reads */ if (op == REQ_OP_READ) { - zero_user(bvec->bv_page, bvec->bv_offset + bvec->bv_len, + struct bio_vec bv; + + bvec_get_last_page(bvec, &bv); + zero_user(bv.bv_page, bv.bv_offset + bv.bv_len, truncated_bytes); } } -- 2.9.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org