From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Cc: aelder@sgi.com
Subject: [PATCH 4/6] xfs: xfs_trans_read_buf() should return an error on failure
Date: Wed, 23 Mar 2011 17:14:28 +1100 [thread overview]
Message-ID: <1300860870-15471-5-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1300860870-15471-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
When inside a transaction and we fail to read a buffer,
xfs_trans_read_buf returns a null buffer pointer and no error.
xfs_do_da_buf() checks the error return, but not the buffer, and as
a result this read failure condition causes a panic when it attempts
to dereference the non-existant buffer.
Make xfs_trans_read_buf() return the same error for this situation
regardless of whether it is in a transaction or not. This means
every caller does not need to check both the error return and the
buffer before proceeding to use the buffer.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_trans_buf.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index 3bea661..03b3b7f 100644
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -383,7 +383,8 @@ xfs_trans_read_buf(
bp = xfs_buf_read(target, blkno, len, flags | XBF_DONT_BLOCK);
if (bp == NULL) {
*bpp = NULL;
- return 0;
+ return (flags & XBF_TRYLOCK) ?
+ 0 : XFS_ERROR(ENOMEM);
}
if (XFS_BUF_GETERROR(bp) != 0) {
XFS_BUF_SUPER_STALE(bp);
--
1.7.2.3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2011-03-23 6:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 6:14 xfs: outstanding patches for 2.6.39 Dave Chinner
2011-03-23 6:14 ` [PATCH 1/6] xfs: preallocation transactions do not need to be synchronous Dave Chinner
2011-03-24 17:18 ` brian.foster
2011-03-24 22:53 ` [PATCH V2] " Dave Chinner
2011-03-25 21:00 ` [PATCH 1/6] " Alex Elder
2011-03-25 22:02 ` Dave Chinner
2011-03-23 6:14 ` [PATCH 2/6] vmap: flush vmap aliases when mapping fails Dave Chinner
2011-03-25 21:00 ` Alex Elder
2011-03-23 6:14 ` [PATCH 3/6] xfs: introduce inode cluster buffer trylocks for xfs_iflush Dave Chinner
2011-03-25 21:00 ` Alex Elder
2011-03-23 6:14 ` Dave Chinner [this message]
2011-03-23 11:53 ` [PATCH 4/6] xfs: xfs_trans_read_buf() should return an error on failure Christoph Hellwig
2011-03-25 21:01 ` Alex Elder
2011-03-23 6:14 ` [PATCH 5/6] xfs: register the inode cache shrinker before quotachecks Dave Chinner
2011-03-23 21:24 ` Arkadiusz Miskiewicz
2011-03-25 12:56 ` Michael Weissenbacher
2011-03-25 23:08 ` Dave Chinner
2011-03-25 21:01 ` Alex Elder
2011-03-23 6:14 ` [PATCH 6/6] xfs: stop using the page cache to back the buffer cache Dave Chinner
2011-03-25 21:02 ` Alex Elder
2011-03-25 22:04 ` Dave Chinner
2011-03-23 7:01 ` xfs: outstanding patches for 2.6.39 Andi Kleen
2011-03-23 11:38 ` Dave Chinner
2011-03-23 16:05 ` Andi Kleen
2011-03-23 22:48 ` Dave Chinner
2011-03-23 11:18 ` Christoph Hellwig
2011-03-23 11:38 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300860870-15471-5-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=aelder@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox