The patch titled fs/reiserfs: use an IS_ERR test rather than a NULL test has been added to the -mm tree. Its filename is fs-reiserfs-use-an-is_err-test-rather-than-a-null-test.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/reiserfs: use an IS_ERR test rather than a NULL test From: Julien Brunel <brunel@xxxxxxx> In case of error, the function open_xa_dir returns an ERR pointer, but never returns a NULL pointer. So a NULL test that comes after an IS_ERR test should be deleted. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @match_bad_null_test@ expression x, E; statement S1,S2; @@ x = open_xa_dir(...) ... when != x = E ( * if (x == NULL && ...) S1 else S2 | * if (x == NULL || ...) S1 else S2 ) // </smpl> Signed-off-by: Julien Brunel <brunel@xxxxxxx> Signed-off-by: Julia Lawall <julia@xxxxxxx> Cc: Jeff Mahoney <jeffm@xxxxxxxx> Cc: Jan Kara <jack@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiserfs/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/reiserfs/xattr.c~fs-reiserfs-use-an-is_err-test-rather-than-a-null-test fs/reiserfs/xattr.c --- a/fs/reiserfs/xattr.c~fs-reiserfs-use-an-is_err-test-rather-than-a-null-test +++ a/fs/reiserfs/xattr.c @@ -155,7 +155,7 @@ static struct dentry *get_xa_file_dentry xadir = open_xa_dir(inode, flags); if (IS_ERR(xadir)) { return ERR_CAST(xadir); - } else if (xadir && !xadir->d_inode) { + } else if (!xadir->d_inode) { dput(xadir); return ERR_PTR(-ENODATA); } _ Patches currently in -mm which might be from brunel@xxxxxxx are origin.patch linux-next.patch fs-gfs2-use-an-is_err-test-rather-than-a-null-test.patch checkpatch-suppress-errors-triggered-by-short-patch.patch fs-reiserfs-use-an-is_err-test-rather-than-a-null-test.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