diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-09-01 10:30:11 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-09-01 10:30:11 +1000 |
| commit | 5d54b8cdeaf4679c51a510dea3f8921992d0b064 (patch) | |
| tree | 62852f195efbd0e5c2bb222d6b74896de4ceac57 /fs/xfs/xfs_aops.c | |
| parent | 70b33a7466baac62103e04c916b8915665b79d80 (diff) | |
| parent | 1a7ccad88d1bcebabc011b54a2f8615175e523fc (diff) | |
| download | op-kernel-dev-5d54b8cdeaf4679c51a510dea3f8921992d0b064.zip op-kernel-dev-5d54b8cdeaf4679c51a510dea3f8921992d0b064.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.3-4' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.c')
| -rw-r--r-- | fs/xfs/xfs_aops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 3859f5e..458fced 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -356,7 +356,8 @@ xfs_end_bio( { xfs_ioend_t *ioend = bio->bi_private; - ioend->io_error = test_bit(BIO_UPTODATE, &bio->bi_flags) ? 0 : error; + if (!ioend->io_error && !test_bit(BIO_UPTODATE, &bio->bi_flags)) + ioend->io_error = error; /* Toss bio and pass work off to an xfsdatad thread */ bio->bi_private = NULL; |
