aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJulien Brunel <brunel@diku.dk>2008-09-01 04:51:22 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2008-09-05 09:19:44 -0400
commitbd1eb8818cc2c8ddab86be027ab43fb852942704 (patch)
treeb072daf0c29f929217acc7a589b48c615da6b238 /fs
parentdff5257473ca1e05002809809f51f858e9a966fc (diff)
GFS2: Use an IS_ERR test rather than a NULL test
In case of error, the function gfs2_inode_lookup returns an ERR pointer, but never returns a NULL pointer. So a NULL test that necessarily comes after an IS_ERR test should be deleted, and a NULL test that may come after a call to this function should be strengthened by an IS_ERR test. 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 = gfs2_inode_lookup(...) ... when != x = E * if (x != NULL) S1 else S2 // </smpl> Signed-off-by: Julien Brunel <brunel@diku.dk> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 87525523446d..c8a959c09f1e 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1033,13 +1033,11 @@ struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
1033 1033
1034 if (bh) 1034 if (bh)
1035 brelse(bh); 1035 brelse(bh);
1036 if (!inode)
1037 return ERR_PTR(-ENOMEM);
1038 return inode; 1036 return inode;
1039 1037
1040fail_gunlock2: 1038fail_gunlock2:
1041 gfs2_glock_dq_uninit(ghs + 1); 1039 gfs2_glock_dq_uninit(ghs + 1);
1042 if (inode) 1040 if (inode && !IS_ERR(inode))
1043 iput(inode); 1041 iput(inode);
1044fail_gunlock: 1042fail_gunlock:
1045 gfs2_glock_dq(ghs); 1043 gfs2_glock_dq(ghs);