[GFS2] Macros removal in gfs2.h

As suggested by Pekka Enberg <penberg@cs.helsinki.fi>.

The DIV_RU macro is renamed DIV_ROUND_UP and and moved to kernel.h
The other macros are gone from gfs2.h as (although not requested
by Pekka Enberg) are a number of included header file which are now
included individually. The inode number comparison function is
now an inline function.

The DT2IF and IF2DT may be addressed in a future patch.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

2 files changed, 8 insertions, 4 deletions

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index ec432e0c208d..8d4f0445df47 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -50,15 +50,18 @@
  * An on-disk inode number
  */
 
-#define gfs2_inum_equal(ino1, ino2) \
-        (((ino1)->no_formal_ino == (ino2)->no_formal_ino) && \
-        ((ino1)->no_addr == (ino2)->no_addr))
-
 struct gfs2_inum {
         __be64 no_formal_ino;
         __be64 no_addr;
 };
 
+static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
+                                  const struct gfs2_inum *ino2)
+{
+        return ino1->no_formal_ino == ino2->no_formal_ino &&
+               ino1->no_addr == ino2->no_addr;
+}
+
 /*
  * Generic metadata head structure
  * Every inplace buffer logged in the journal must start with this.
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3b507bf05d09..f789278a625a 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -29,6 +29,7 @@ extern const char linux_banner[];
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 
 #define KERN_EMERG      "<0>"   /* system is unusable                   */
 #define KERN_ALERT      "<1>"   /* action must be taken immediately     */