[GFS2] Change argument to gfs2_dinode_print

Change argument for gfs2_dinode_print in order to prepare
for removal of duplicate fields between struct inode and
struct gfs2_dinode_host.

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

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index b39cfcfe92766e08dc35757ff293fa6404184358..4c5d286fefdb91f9537a04d8173be061e922ced8 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -269,7 +269,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip)
 
        if (ip->i_num.no_addr != ip->i_di.di_num.no_addr) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                return -EIO;
        }
        if (ip->i_num.no_formal_ino != ip->i_di.di_num.no_formal_ino)
@@ -289,7 +289,7 @@ int gfs2_dinode_dealloc(struct gfs2_inode *ip)
 
        if (ip->i_di.di_blocks != 1) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                return -EIO;
        }
 
@@ -359,7 +359,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
           bigger than the old one, we must have underflowed. */
        if (diff < 0 && nlink > ip->i_di.di_nlink) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                return -EIO;
        }
 
@@ -1010,7 +1010,7 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name,
 
        if (ip->i_di.di_entries != 2) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                return -EIO;
        }
 

diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 062a44f87fec3486a1e6062904fd9e41396552d0..77bed440833d5223284133106e81391a5a3e37c0 100644 (file)
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -190,8 +190,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
 
 }
 
-void gfs2_dinode_print(const struct gfs2_dinode_host *di)
+void gfs2_dinode_print(const struct gfs2_inode *ip)
 {
+       const struct gfs2_dinode_host *di = &ip->i_di;
+
        gfs2_meta_header_print(&di->di_header);
        gfs2_inum_print(&di->di_num);
 

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index bd268852c674c0d807841b4f92159136de0e942f..b2c2fe613d70e9bc9ccb6cb12aaf72cca5860f4a 100644 (file)
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -467,7 +467,7 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
 
        if (ip->i_di.di_entries < 2) {
                if (gfs2_consist_inode(ip))
-                       gfs2_dinode_print(&ip->i_di);
+                       gfs2_dinode_print(ip);
                error = -EIO;
                goto out_gunlock;
        }
@@ -640,7 +640,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
                if (S_ISDIR(nip->i_di.di_mode)) {
                        if (nip->i_di.di_entries < 2) {
                                if (gfs2_consist_inode(nip))
-                                       gfs2_dinode_print(&nip->i_di);
+                                       gfs2_dinode_print(nip);
                                error = -EIO;
                                goto out_gunlock;
                        }

diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index 4fc297a1ef952b0e8c1b1c7e7ff32b53f475f027..cf4c655d0d5f14e71f861a5811204353a6d44701 100644 (file)
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -549,7 +549,7 @@ extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *
 /* Printing functions */
 
 extern void gfs2_rindex_print(const struct gfs2_rindex_host *ri);
-extern void gfs2_dinode_print(const struct gfs2_dinode_host *di);
+extern void gfs2_dinode_print(const struct gfs2_inode *ip);
 
 #endif /* __KERNEL__ */