summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_mount.c
diff options
context:
space:
mode:
authorDave Chinner2012-11-12 12:54:02 +0100
committerBen Myers2012-11-16 04:34:05 +0100
commiteab4e63368b4cfa597dbdac66d1a7a836a693b7d (patch)
tree37d6756a3fd9e43ecf65d1b4a3950ecd34ad653f /fs/xfs/xfs_mount.c
parentxfs: make buffer read verication an IO completion function (diff)
downloadkernel-qcow2-linux-eab4e63368b4cfa597dbdac66d1a7a836a693b7d.tar.gz
kernel-qcow2-linux-eab4e63368b4cfa597dbdac66d1a7a836a693b7d.tar.xz
kernel-qcow2-linux-eab4e63368b4cfa597dbdac66d1a7a836a693b7d.zip
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_mount.c')
-rw-r--r--fs/xfs/xfs_mount.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index d5402b0eb6a3..df6d0b2aade1 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -658,6 +658,12 @@ reread:
xfs_warn(mp, "SB buffer read failed");
return EIO;
}
+ if (bp->b_error) {
+ error = bp->b_error;
+ if (loud)
+ xfs_warn(mp, "SB validate failed");
+ goto release_buf;
+ }
/*
* Initialize the mount structure from the superblock.