summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-05 15:41:57 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-05 15:41:57 -0400
commit2c1e52aa905f2223dc600cfeda6c0dc94fac8b81 (patch)
treee6fde16db33a666fe87da34100c0ad5466654555
parent48fac1790935ef2f9548d92e7c8ba604d1b80c12 (diff)
downloadop-kernel-dev-2c1e52aa905f2223dc600cfeda6c0dc94fac8b81.zip
op-kernel-dev-2c1e52aa905f2223dc600cfeda6c0dc94fac8b81.tar.gz
[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>
-rw-r--r--fs/gfs2/rgrp.c13
-rw-r--r--fs/gfs2/rgrp.h5
-rw-r--r--fs/gfs2/sys.c2
3 files changed, 6 insertions, 14 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index baa93c5..7a5ab81 100644
--- 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)
@@ -694,17 +694,6 @@ struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip)
}
/**
- * 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
* @al: the struct gfs2_alloc structure describing the reservation
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h
index 3558957..9eedfd1 100644
--- 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 7a282a4..0d7f0a4 100644
--- 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,
};
OpenPOWER on IntegriCloud