Subject: [folded-merged] ocfs2-add-necessary-check-in-case-sb_getblk-fails-update.patch removed from -mm tree
To: joseph.qi@xxxxxxxxxx,jeff.liu@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxx,rui.xiang@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 12 Nov 2013 14:32:15 -0800
The patch titled
Subject: ocfs2-add-necessary-check-in-case-sb_getblk-fails-update
has been removed from the -mm tree. Its filename was
ocfs2-add-necessary-check-in-case-sb_getblk-fails-update.patch
This patch was dropped because it was folded into ocfs2-add-necessary-check-in-case-sb_getblk-fails.patch
------------------------------------------------------
From: Joseph Qi <joseph.qi@xxxxxxxxxx>
Subject: ocfs2-add-necessary-check-in-case-sb_getblk-fails-update
Need also add a check after calling sb_getblk in ocfs2_create_xattr_block.
Cc: Rui Xiang <rui.xiang@xxxxxxxxxx>
Cc: Jie Liu <jeff.liu@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/xattr.c | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN fs/ocfs2/xattr.c~ocfs2-add-necessary-check-in-case-sb_getblk-fails-update fs/ocfs2/xattr.c
--- a/fs/ocfs2/xattr.c~ocfs2-add-necessary-check-in-case-sb_getblk-fails-update
+++ a/fs/ocfs2/xattr.c
@@ -2864,6 +2864,12 @@ static int ocfs2_create_xattr_block(stru
}
new_bh = sb_getblk(inode->i_sb, first_blkno);
+ if (!new_bh) {
+ ret = -ENOMEM;
+ mlog_errno(ret);
+ goto end;
+ }
+
ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
ret = ocfs2_journal_access_xb(ctxt->handle, INODE_CACHE(inode),
_
Patches currently in -mm which might be from joseph.qi@xxxxxxxxxx are
ocfs2-return-enomem-when-sb_getblk-fails.patch
ocfs2-add-necessary-check-in-case-sb_getblk-fails.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
