gfs2: Delete an unnecessary check before brelse()

The brelse() function tests whether its argument is NULL and then
returns immediately.  Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

[The same applies to brelse() in gfs2_dir_no_add (which Coccinelle
apparently missed), so fix that as well.]

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 6f35d19eec2537aad6c575fa504aa19ad9ee3b3a..eb9c0578978fe46b62a9c9ad7fee3a97d1e48eab 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1463,8 +1463,7 @@ static int gfs2_dir_read_leaf(struct inode *inode, struct dir_context *ctx,
                                sort_offset : entries, copied);
 out_free:
        for(i = 0; i < leaf; i++)
-               if (larr[i])
-                       brelse(larr[i]);
+               brelse(larr[i]);
        kvfree(larr);
 out:
        return error;

diff --git a/fs/gfs2/dir.h b/fs/gfs2/dir.h
index 0ac2dc8564df15095c499c28afd46d5c8a24f9b8..5b76480c17c9e90c8c8699fd6c5ce931ec493418 100644 (file)
--- a/fs/gfs2/dir.h
+++ b/fs/gfs2/dir.h
@@ -32,8 +32,7 @@ extern int gfs2_dir_add(struct inode *inode, const struct qstr *filename,
                        const struct gfs2_inode *ip, struct gfs2_diradd *da);
 static inline void gfs2_dir_no_add(struct gfs2_diradd *da)
 {
-       if (da->bh)
-               brelse(da->bh);
+       brelse(da->bh);
        da->bh = NULL;
 }
 extern int gfs2_dir_del(struct gfs2_inode *dip, const struct dentry *dentry);