aboutsummaryrefslogtreecommitdiffstats
path: root/fs/logfs/dev_bdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/logfs/dev_bdev.c')
-rw-r--r--fs/logfs/dev_bdev.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c
index 76279e11982d..cea0cc9878b7 100644
--- a/fs/logfs/dev_bdev.c
+++ b/fs/logfs/dev_bdev.c
@@ -53,16 +53,14 @@ static int bdev_readpage(void *_sb, struct page *page)
53 53
54static DECLARE_WAIT_QUEUE_HEAD(wq); 54static DECLARE_WAIT_QUEUE_HEAD(wq);
55 55
56static void writeseg_end_io(struct bio *bio, int err) 56static void writeseg_end_io(struct bio *bio)
57{ 57{
58 const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
59 struct bio_vec *bvec; 58 struct bio_vec *bvec;
60 int i; 59 int i;
61 struct super_block *sb = bio->bi_private; 60 struct super_block *sb = bio->bi_private;
62 struct logfs_super *super = logfs_super(sb); 61 struct logfs_super *super = logfs_super(sb);
63 62
64 BUG_ON(!uptodate); /* FIXME: Retry io or write elsewhere */ 63 BUG_ON(bio->bi_error); /* FIXME: Retry io or write elsewhere */
65 BUG_ON(err);
66 64
67 bio_for_each_segment_all(bvec, bio, i) { 65 bio_for_each_segment_all(bvec, bio, i) {
68 end_page_writeback(bvec->bv_page); 66 end_page_writeback(bvec->bv_page);
@@ -153,14 +151,12 @@ static void bdev_writeseg(struct super_block *sb, u64 ofs, size_t len)
153} 151}
154 152
155 153
156static void erase_end_io(struct bio *bio, int err) 154static void erase_end_io(struct bio *bio)
157{ 155{
158 const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
159 struct super_block *sb = bio->bi_private; 156 struct super_block *sb = bio->bi_private;
160 struct logfs_super *super = logfs_super(sb); 157 struct logfs_super *super = logfs_super(sb);
161 158
162 BUG_ON(!uptodate); /* FIXME: Retry io or write elsewhere */ 159 BUG_ON(bio->bi_error); /* FIXME: Retry io or write elsewhere */
163 BUG_ON(err);
164 BUG_ON(bio->bi_vcnt == 0); 160 BUG_ON(bio->bi_vcnt == 0);
165 bio_put(bio); 161 bio_put(bio);
166 if (atomic_dec_and_test(&super->s_pending_writes)) 162 if (atomic_dec_and_test(&super->s_pending_writes))