lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 21 Jan 2019 16:17:48 +0800 From: Ming Lei <ming.lei@...hat.com> To: Jens Axboe <axboe@...nel.dk> Cc: linux-block@...r.kernel.org, linux-kernel@...r.kernel.org, linux-mm@...ck.org, Theodore Ts'o <tytso@....edu>, Omar Sandoval <osandov@...com>, Sagi Grimberg <sagi@...mberg.me>, Dave Chinner <dchinner@...hat.com>, Kent Overstreet <kent.overstreet@...il.com>, Mike Snitzer <snitzer@...hat.com>, dm-devel@...hat.com, Alexander Viro <viro@...iv.linux.org.uk>, linux-fsdevel@...r.kernel.org, linux-raid@...r.kernel.org, David Sterba <dsterba@...e.com>, linux-btrfs@...r.kernel.org, "Darrick J . Wong" <darrick.wong@...cle.com>, linux-xfs@...r.kernel.org, Gao Xiang <gaoxiang25@...wei.com>, Christoph Hellwig <hch@....de>, linux-ext4@...r.kernel.org, Coly Li <colyli@...e.de>, linux-bcache@...r.kernel.org, Boaz Harrosh <ooo@...ctrozaur.com>, Bob Peterson <rpeterso@...hat.com>, cluster-devel@...hat.com Subject: [PATCH V14 01/18] btrfs: look at bi_size for repair decisions From: Christoph Hellwig <hch@....de> bio_readpage_error currently uses bi_vcnt to decide if it is worth retrying an I/O. But the vector count is mostly an implementation artifact - it really should figure out if there is more than a single sector worth retrying. Use bi_size for that and shift by PAGE_SHIFT. This really should be blocks/sectors, but given that btrfs doesn't support a sector size different from the PAGE_SIZE using the page size keeps the changes to a minimum. Reviewed-by: Omar Sandoval <osandov@...com> Reviewed-by: David Sterba <dsterba@...e.com> Signed-off-by: Christoph Hellwig <hch@....de> --- fs/btrfs/extent_io.c | 2 +- include/linux/bio.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 52abe4082680..dc8ba3ee515d 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2350,7 +2350,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, int read_mode = 0; blk_status_t status; int ret; - unsigned failed_bio_pages = bio_pages_all(failed_bio); + unsigned failed_bio_pages = failed_bio->bi_iter.bi_size >> PAGE_SHIFT; BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE); diff --git a/include/linux/bio.h b/include/linux/bio.h index 7380b094dcca..72b4f7be2106 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -263,12 +263,6 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv) bv->bv_len = iter.bi_bvec_done; } -static inline unsigned bio_pages_all(struct bio *bio) -{ - WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); - return bio->bi_vcnt; -} - static inline struct bio_vec *bio_first_bvec_all(struct bio *bio) { WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); -- 2.9.5
Powered by blists - more mailing lists