[GFS2] More style fixes

As per Jan Engelhardt's follow up emails, here are a few small
fixes which were missed earlier.

Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index baa93c5d9592f0b9a7486d58cbb64fd8e01ac9d1..7a5ab817ad9c7825d7b120e51ad9224d98296e37 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -29,7 +29,7 @@
 #include "ops_file.h"
 #include "util.h"
 
-#define BFITNOENT (u32)~0
+#define BFITNOENT ((u32)~0)
 
 /*
  * These routines are used by the resource group routines (rgrp.c)
@@ -693,17 +693,6 @@ struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip)
        return al;
 }
 
-/**
- * gfs2_alloc_put - throw away the struct gfs2_alloc for an inode
- * @ip: the inode
- *
- */
-
-void gfs2_alloc_put(struct gfs2_inode *ip)
-{
-       return;
-}
-
 /**
  * try_rgrp_fit - See if a given reservation will fit in a given RG
  * @rgd: the RG data

diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
index 3558957673876fc870df04e1aaeefb0d9e19f6e0..9eedfd12bfff5d60a610e98c50c5f05075d18504 100644 (file)
--- a/fs/gfs2/rgrp.h
+++ b/fs/gfs2/rgrp.h
@@ -30,7 +30,10 @@ void gfs2_rgrp_bh_put(struct gfs2_rgrpd *rgd);
 void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd);
 
 struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip);
-void gfs2_alloc_put(struct gfs2_inode *ip);
+static inline void gfs2_alloc_put(struct gfs2_inode *ip)
+{
+       return; /* Se we can see where ip->i_alloc is used */
+}
 
 int gfs2_inplace_reserve_i(struct gfs2_inode *ip,
                         char *file, unsigned int line);

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 7a282a4bde2abb026fb3eca55046a61c0b1f0d1e..0d7f0a4e3717415f431386d7b6c44400ebcff7e8 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -223,7 +223,7 @@ static struct kobj_type gfs2_ktype = {
 
 static struct kset gfs2_kset = {
        .subsys = &fs_subsys,
-       .kobj   = {.name = "gfs2",},
+       .kobj   = {.name = "gfs2"},
        .ktype  = &gfs2_ktype,
 };