Tao Ma
2008-Oct-23 23:57 UTC
[Ocfs2-devel] [PATCH 1/1] ocfs2/xattr: Fix check of return value of ocfs2_start_trans().
Hi Joel,
this should be in your xattr-28 branch I think.
On failure, ocfs2_start_trans() returns values like ERR_PTR(-ENOMEM),
so we should check whether handle is NULL. Fix them to use IS_ERR().
Jan has made the patch for other part in ocfs2(thank Jan for it), so
this is just the fix for fs/ocfs2/xattr.c.
Signed-off-by: Tao Ma <tao.ma at oracle.com>
Cc: Jan Kara <jack at suse.cz>
Cc: Joel Becker <joel.becker at oracle.com>
---
fs/ocfs2/xattr.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 789fb70..a371c01 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -4092,7 +4092,7 @@ static int ocfs2_xattr_value_update_size(struct inode
*inode,
handle_t *handle = NULL;
handle = ocfs2_start_trans(osb, 1);
- if (handle == NULL) {
+ if (IS_ERR(handle)) {
ret = -ENOMEM;
mlog_errno(ret);
goto out;
@@ -4259,7 +4259,7 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode,
}
handle = ocfs2_start_trans(osb, OCFS2_REMOVE_EXTENT_CREDITS);
- if (handle == NULL) {
+ if (IS_ERR(handle)) {
ret = -ENOMEM;
mlog_errno(ret);
goto out;
--
1.5.4.GIT
Joel Becker
2008-Oct-24 21:40 UTC
[Ocfs2-devel] [PATCH 1/1] ocfs2/xattr: Fix check of return value of ocfs2_start_trans().
On Fri, Oct 24, 2008 at 07:57:28AM +0800, Tao Ma wrote:> Hi Joel, > this should be in your xattr-28 branch I think.Agreed. This is now in my xattr-28 branch. Joel -- "Here's a nickle -- get yourself a better X server." - Keith Packard Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127