From b19600ed84e0ebf0f6c2851ef86f38ab60a98c12 Mon Sep 17 00:00:00 2001 From: Chuck Anderson Date: Sat, 19 Mar 2016 12:37:44 -0700 Subject: [PATCH] Revert "xfs: return errors from partial I/O failures to files" This reverts commit 2e58ec0b4619ce115b9ae952259697a76b0e528c. It will be replaced by an updated commit. Signed-off-by: Chuck Anderson --- fs/xfs/xfs_aops.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 75d7fd657948..095f94c2d8b5 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -355,10 +355,8 @@ xfs_end_bio( int error) { xfs_ioend_t *ioend = bio->bi_private; - ASSERT(atomic_read(&bio->bi_cnt) >= 1); - if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags)) - ioend->io_error = error; + ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; /* Toss bio and pass work off to an xfsdatad thread */ bio->bi_private = NULL; -- 2.50.1