path: root/fs/xfs/xfs_fsops.c
diff options
authorDave Chinner <dchinner@redhat.com>2012-11-12 22:54:02 +1100
committerBen Myers <bpm@sgi.com>2012-11-15 21:34:05 -0600
commiteab4e63368b4cfa597dbdac66d1a7a836a693b7d (patch)
tree37d6756a3fd9e43ecf65d1b4a3950ecd34ad653f /fs/xfs/xfs_fsops.c
parentc3f8fc73ac97b76a12692088ef9cace9af8422c0 (diff)
xfs: uncached buffer reads need to return an error
With verification being done as an IO completion callback, different errors can be returned from a read. Uncached reads only return a buffer or NULL on failure, which means the verification error cannot be returned to the caller. Split the error handling for these reads into two - a failure to get a buffer will still return NULL, but a read error will return a referenced buffer with b_error set rather than NULL. The caller is responsible for checking the error state of the buffer returned. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Phil White <pwhite@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 5440768ec41..f35f8d7731f 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -171,6 +171,11 @@ xfs_growfs_data_private(
XFS_FSS_TO_BB(mp, 1), 0, NULL);
if (!bp)
return EIO;
+ if (bp->b_error) {
+ int error = bp->b_error;
+ xfs_buf_relse(bp);
+ return error;
+ }
new = nb; /* use new as a temporary here */