[GFS2] inode-diet: Eliminate i_blksize from the inode structure

[~andy/linux] / fs / gfs2 / inode.c

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0d010f0654d9178d98e0702df79c8e9c0c636175..57a4c8b68587134059e4c505cd2cf3c56ffb79c7 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -16,9 +16,9 @@
 #include <linux/sort.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "acl.h"
 #include "bmap.h"
@@ -72,7 +72,6 @@ void gfs2_inode_attr_in(struct gfs2_inode *ip)
        inode->i_atime.tv_nsec = 0;
        inode->i_mtime.tv_nsec = 0;
        inode->i_ctime.tv_nsec = 0;
-       inode->i_blksize = PAGE_SIZE;
        inode->i_blocks = di->di_blocks <<
                (GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
 
@@ -160,7 +159,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum *inum,
        if (inode->i_state & I_NEW) {
                struct gfs2_sbd *sdp = GFS2_SB(inode);
                umode_t mode = DT2IF(type);
-               inode->u.generic_ip = ip;
+               inode->i_private = ip;
                inode->i_mode = mode;
 
                if (S_ISREG(mode)) {
@@ -386,7 +385,6 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)
 
 struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name,
                           int is_root, struct nameidata *nd)
-                
 {
        struct super_block *sb = dir->i_sb;
        struct gfs2_inode *dip = GFS2_I(dir);
@@ -491,7 +489,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, u64 *formal_ino)
        error = gfs2_meta_inode_buffer(ip, &bh);
        if (error)
                goto out_end_trans;
-       
+
        gfs2_inum_range_in(&ir, bh->b_data + sizeof(struct gfs2_dinode));
 
        if (!ir.ir_length) {
@@ -769,7 +767,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
 
                error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
                                         al->al_rgd->rd_ri.ri_length +
-                                        2 * RES_DINODE + 
+                                        2 * RES_DINODE +
                                         RES_STATFS + RES_QUOTA, 0);
                if (error)
                        goto fail_ipreserv;