[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 1aaaaa1cc8c32d8e0006f166bb851958760e7114..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"
@@ -47,40 +47,40 @@
 void gfs2_inode_attr_in(struct gfs2_inode *ip)
 {
        struct inode *inode = &ip->i_inode;
+       struct gfs2_dinode *di = &ip->i_di;
 
        inode->i_ino = ip->i_num.no_addr;
 
-       switch (ip->i_di.di_mode & S_IFMT) {
+       switch (di->di_mode & S_IFMT) {
        case S_IFBLK:
        case S_IFCHR:
-               inode->i_rdev = MKDEV(ip->i_di.di_major, ip->i_di.di_minor);
+               inode->i_rdev = MKDEV(di->di_major, di->di_minor);
                break;
        default:
                inode->i_rdev = 0;
                break;
        };
 
-       inode->i_mode = ip->i_di.di_mode;
-       inode->i_nlink = ip->i_di.di_nlink;
-       inode->i_uid = ip->i_di.di_uid;
-       inode->i_gid = ip->i_di.di_gid;
-       i_size_write(inode, ip->i_di.di_size);
-       inode->i_atime.tv_sec = ip->i_di.di_atime;
-       inode->i_mtime.tv_sec = ip->i_di.di_mtime;
-       inode->i_ctime.tv_sec = ip->i_di.di_ctime;
+       inode->i_mode = di->di_mode;
+       inode->i_nlink = di->di_nlink;
+       inode->i_uid = di->di_uid;
+       inode->i_gid = di->di_gid;
+       i_size_write(inode, di->di_size);
+       inode->i_atime.tv_sec = di->di_atime;
+       inode->i_mtime.tv_sec = di->di_mtime;
+       inode->i_ctime.tv_sec = di->di_ctime;
        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 = ip->i_di.di_blocks <<
+       inode->i_blocks = di->di_blocks <<
                (GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
 
-       if (ip->i_di.di_flags & GFS2_DIF_IMMUTABLE)
+       if (di->di_flags & GFS2_DIF_IMMUTABLE)
                inode->i_flags |= S_IMMUTABLE;
        else
                inode->i_flags &= ~S_IMMUTABLE;
 
-       if (ip->i_di.di_flags & GFS2_DIF_APPENDONLY)
+       if (di->di_flags & GFS2_DIF_APPENDONLY)
                inode->i_flags |= S_APPEND;
        else
                inode->i_flags &= ~S_APPEND;
@@ -159,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)) {
@@ -311,7 +311,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
 {
        struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
        struct buffer_head *dibh;
-       uint32_t nlink;
+       u32 nlink;
        int error;
 
        BUG_ON(ip->i_di.di_nlink != ip->i_inode.i_nlink);
@@ -385,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);
@@ -428,7 +427,7 @@ out:
        return inode;
 }
 
-static int pick_formal_ino_1(struct gfs2_sbd *sdp, uint64_t *formal_ino)
+static int pick_formal_ino_1(struct gfs2_sbd *sdp, u64 *formal_ino)
 {
        struct gfs2_inode *ip = GFS2_I(sdp->sd_ir_inode);
        struct buffer_head *bh;
@@ -469,7 +468,7 @@ static int pick_formal_ino_1(struct gfs2_sbd *sdp, uint64_t *formal_ino)
        return 1;
 }
 
-static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *formal_ino)
+static int pick_formal_ino_2(struct gfs2_sbd *sdp, u64 *formal_ino)
 {
        struct gfs2_inode *ip = GFS2_I(sdp->sd_ir_inode);
        struct gfs2_inode *m_ip = GFS2_I(sdp->sd_inum_inode);
@@ -490,18 +489,18 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *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) {
                struct buffer_head *m_bh;
-               uint64_t x, y;
+               u64 x, y;
 
                error = gfs2_meta_inode_buffer(m_ip, &m_bh);
                if (error)
                        goto out_brelse;
 
-               x = *(uint64_t *)(m_bh->b_data + sizeof(struct gfs2_dinode));
+               x = *(u64 *)(m_bh->b_data + sizeof(struct gfs2_dinode));
                x = y = be64_to_cpu(x);
                ir.ir_start = x;
                ir.ir_length = GFS2_INUM_QUANTUM;
@@ -510,7 +509,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *formal_ino)
                        gfs2_consist_inode(m_ip);
                x = cpu_to_be64(x);
                gfs2_trans_add_bh(m_ip->i_gl, m_bh, 1);
-               *(uint64_t *)(m_bh->b_data + sizeof(struct gfs2_dinode)) = x;
+               *(u64 *)(m_bh->b_data + sizeof(struct gfs2_dinode)) = x;
 
                brelse(m_bh);
        }
@@ -531,7 +530,7 @@ out:
        return error;
 }
 
-static int pick_formal_ino(struct gfs2_sbd *sdp, uint64_t *inum)
+static int pick_formal_ino(struct gfs2_sbd *sdp, u64 *inum)
 {
        int error;
 
@@ -577,9 +576,9 @@ static int create_ok(struct gfs2_inode *dip, const struct qstr *name,
                return error;
        }
 
-       if (dip->i_di.di_entries == (uint32_t)-1)
+       if (dip->i_di.di_entries == (u32)-1)
                return -EFBIG;
-       if (S_ISDIR(mode) && dip->i_di.di_nlink == (uint32_t)-1)
+       if (S_ISDIR(mode) && dip->i_di.di_nlink == (u32)-1)
                return -EMLINK;
 
        return 0;
@@ -768,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;
@@ -1131,7 +1130,7 @@ int gfs2_glock_nq_atime(struct gfs2_holder *gh)
        struct gfs2_glock *gl = gh->gh_gl;
        struct gfs2_sbd *sdp = gl->gl_sbd;
        struct gfs2_inode *ip = gl->gl_object;
-       int64_t curtime, quantum = gfs2_tune_get(sdp, gt_atime_quantum);
+       s64 curtime, quantum = gfs2_tune_get(sdp, gt_atime_quantum);
        unsigned int state;
        int flags;
        int error;