diff options
| author | Dave Chinner <dchinner@redhat.com> | 2012-04-23 07:58:46 +0200 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-05-14 23:20:42 +0200 |
| commit | 0e95f19ad983e72a9cb93a67b3290b58f0467b36 (patch) | |
| tree | 2b3117e20f1e739d5cb560b1b1b32f3fdc8e3ee5 /fs/xfs/xfs_buf.h | |
| parent | xfs: fix buffer lookup race on allocation failure (diff) | |
| download | linux-0e95f19ad983e72a9cb93a67b3290b58f0467b36.tar.xz linux-0e95f19ad983e72a9cb93a67b3290b58f0467b36.zip | |
xfs: check for buffer errors before waiting
If we call xfs_buf_iowait() on a buffer that failed dispatch due to
an IO error, it will wait forever for an Io that does not exist.
This is hndled in xfs_buf_read, but there is other code that calls
xfs_buf_iowait directly that doesn't.
Rather than make the call sites have to handle checking for dispatch
errors and then checking for completion errors, make
xfs_buf_iowait() check for dispatch errors on the buffer before
waiting. This means we handle both dispatch and completion errors
with one set of error handling at the caller sites.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_buf.h')
| -rw-r--r-- | fs/xfs/xfs_buf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index 7083cf44d95f..87a474853f8a 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h @@ -191,7 +191,7 @@ extern int xfs_bdstrat_cb(struct xfs_buf *); extern void xfs_buf_ioend(xfs_buf_t *, int); extern void xfs_buf_ioerror(xfs_buf_t *, int); extern void xfs_buf_ioerror_alert(struct xfs_buf *, const char *func); -extern int xfs_buf_iorequest(xfs_buf_t *); +extern void xfs_buf_iorequest(xfs_buf_t *); extern int xfs_buf_iowait(xfs_buf_t *); extern void xfs_buf_iomove(xfs_buf_t *, size_t, size_t, void *, xfs_buf_rw_t); |