The patch titled fs/ocfs2/aops.c: test for IS_ERR rather than 0 has been removed from the -mm tree. Its filename was fs-ocfs2-aopsc-test-for-is_err-rather-than-0.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/ocfs2/aops.c: test for IS_ERR rather than 0 From: Julia Lawall <julia@xxxxxxx> The function ocfs2_start_trans always returns either a valid pointer or a value made with ERR_PTR, so its result should be tested with IS_ERR, not with a test for 0. The problem was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) //<smpl> @a@ expression E, E1; statement S,S1; position p; @@ E = ocfs2_start_trans(...) ... when != E = E1 if@p (E) S else S1 @n@ position a.p; expression E,E1; statement S,S1; @@ E = NULL ... when != E = E1 if@p (E) S else S1 @depends on !n@ expression E; statement S,S1; position a.p; @@ * if@p (E) S else S1 //</smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> Cc: Mark Fasheh <mark@xxxxxxxxxx> Cc: Kurt Hackel <kurt.hackel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/aops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN fs/ocfs2/aops.c~fs-ocfs2-aopsc-test-for-is_err-rather-than-0 fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c~fs-ocfs2-aopsc-test-for-is_err-rather-than-0 +++ a/fs/ocfs2/aops.c @@ -467,11 +467,11 @@ handle_t *ocfs2_start_walk_page_trans(st unsigned to) { struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); - handle_t *handle = NULL; + handle_t *handle; int ret = 0; handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); - if (!handle) { + if (IS_ERR(handle)) { ret = -ENOMEM; mlog_errno(ret); goto out; @@ -487,7 +487,7 @@ handle_t *ocfs2_start_walk_page_trans(st } out: if (ret) { - if (handle) + if (!IS_ERR(handle)) ocfs2_commit_trans(osb, handle); handle = ERR_PTR(ret); } _ Patches currently in -mm which might be from julia@xxxxxxx are origin.patch git-alsa-tiwai.patch git-powerpc.patch drivers-block-viodasdc-use-field_sizeof.patch git-gfs2-nmw.patch git-infiniband.patch git-udf.patch git-net.patch git-ocfs2.patch fs-affs-filec-use-bug_on.patch drivers-misc-elide-a-non-zero-test-on-a-result-that-is-never-0.patch fbdev-use-div_round_up-or-roundup.patch fs-ext2-use-bug_on.patch fs-ext3-use-bug_on.patch fs-ext4-use-bug_on.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