diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-10-13 10:22:45 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-10-13 10:22:45 +1100 |
| commit | 6889e783cd68b79f8330ad4d10a2571c67c3f7df (patch) | |
| tree | 6ebb3900542a9d449e9c5d9b5191f35845f40130 /fs/xfs/xfs_aops.c | |
| parent | 75e58ce4c8f354f1a68a8bb8a9692827cdaf3d21 (diff) | |
| parent | a8b1ee8bafc765ebf029d03c5479a69aebff9693 (diff) | |
| download | talos-obmc-linux-6889e783cd68b79f8330ad4d10a2571c67c3f7df.tar.gz talos-obmc-linux-6889e783cd68b79f8330ad4d10a2571c67c3f7df.zip | |
Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_aops.c')
| -rw-r--r-- | fs/xfs/xfs_aops.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 2f502537a39c..f5b2453a43b2 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -560,6 +560,13 @@ xfs_cancel_ioend( do { next_bh = bh->b_private; clear_buffer_async_write(bh); + /* + * The unwritten flag is cleared when added to the + * ioend. We're not submitting for I/O so mark the + * buffer unwritten again for next time around. + */ + if (ioend->io_type == XFS_IO_UNWRITTEN) + set_buffer_unwritten(bh); unlock_buffer(bh); } while ((bh = next_bh) != NULL); |
