Commit a9583c79 authored by Steven Whitehouse's avatar Steven Whitehouse

[GFS2] Shrink gfs2_inode (7) - di_payload_format

This is almost never used. Its there for backward
compatibility with GFS1. It doesn't need its own
field since it can always be calculated from the
inode mode & flags. This saves a bit more space
in the gfs2_inode.
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1a7b1eed
...@@ -902,7 +902,6 @@ static int dir_make_exhash(struct inode *inode) ...@@ -902,7 +902,6 @@ static int dir_make_exhash(struct inode *inode)
dip->i_di.di_size = sdp->sd_sb.sb_bsize / 2; dip->i_di.di_size = sdp->sd_sb.sb_bsize / 2;
dip->i_di.di_blocks++; dip->i_di.di_blocks++;
dip->i_di.di_flags |= GFS2_DIF_EXHASH; dip->i_di.di_flags |= GFS2_DIF_EXHASH;
dip->i_di.di_payload_format = 0;
for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ; for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;
dip->i_di.di_depth = y; dip->i_di.di_depth = y;
......
...@@ -210,7 +210,6 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) ...@@ -210,7 +210,6 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
di->di_generation = be64_to_cpu(str->di_generation); di->di_generation = be64_to_cpu(str->di_generation);
di->di_flags = be32_to_cpu(str->di_flags); di->di_flags = be32_to_cpu(str->di_flags);
di->di_payload_format = be32_to_cpu(str->di_payload_format);
di->di_height = be16_to_cpu(str->di_height); di->di_height = be16_to_cpu(str->di_height);
di->di_depth = be16_to_cpu(str->di_depth); di->di_depth = be16_to_cpu(str->di_depth);
...@@ -699,7 +698,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl, ...@@ -699,7 +698,7 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
} }
di->__pad1 = 0; di->__pad1 = 0;
di->di_payload_format = cpu_to_be32(0); di->di_payload_format = cpu_to_be32(S_ISDIR(mode) ? GFS2_FORMAT_DE : 0);
di->di_height = cpu_to_be32(0); di->di_height = cpu_to_be32(0);
di->__pad2 = 0; di->__pad2 = 0;
di->__pad3 = 0; di->__pad3 = 0;
......
...@@ -176,9 +176,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) ...@@ -176,9 +176,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
str->di_generation = cpu_to_be64(di->di_generation); str->di_generation = cpu_to_be64(di->di_generation);
str->di_flags = cpu_to_be32(di->di_flags); str->di_flags = cpu_to_be32(di->di_flags);
str->di_payload_format = cpu_to_be32(di->di_payload_format);
str->di_height = cpu_to_be16(di->di_height); str->di_height = cpu_to_be16(di->di_height);
str->di_payload_format = cpu_to_be32(S_ISDIR(ip->i_inode.i_mode) &&
!(ip->i_di.di_flags & GFS2_DIF_EXHASH) ?
GFS2_FORMAT_DE : 0);
str->di_depth = cpu_to_be16(di->di_depth); str->di_depth = cpu_to_be16(di->di_depth);
str->di_entries = cpu_to_be32(di->di_entries); str->di_entries = cpu_to_be32(di->di_entries);
...@@ -197,7 +198,6 @@ void gfs2_dinode_print(const struct gfs2_inode *ip) ...@@ -197,7 +198,6 @@ void gfs2_dinode_print(const struct gfs2_inode *ip)
printk(KERN_INFO " di_goal_data = %llu\n", (unsigned long long)di->di_goal_data); printk(KERN_INFO " di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
pv(di, di_flags, "0x%.8X"); pv(di, di_flags, "0x%.8X");
pv(di, di_payload_format, "%u");
pv(di, di_height, "%u"); pv(di, di_height, "%u");
pv(di, di_depth, "%u"); pv(di, di_depth, "%u");
......
...@@ -389,7 +389,6 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -389,7 +389,6 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
ip->i_inode.i_nlink = 2; ip->i_inode.i_nlink = 2;
ip->i_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode); ip->i_di.di_size = sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode);
ip->i_di.di_flags |= GFS2_DIF_JDATA; ip->i_di.di_flags |= GFS2_DIF_JDATA;
ip->i_di.di_payload_format = GFS2_FORMAT_DE;
ip->i_di.di_entries = 2; ip->i_di.di_entries = 2;
error = gfs2_meta_inode_buffer(ip, &dibh); error = gfs2_meta_inode_buffer(ip, &dibh);
......
...@@ -333,7 +333,6 @@ struct gfs2_dinode_host { ...@@ -333,7 +333,6 @@ struct gfs2_dinode_host {
__u64 di_generation; /* generation number for NFS */ __u64 di_generation; /* generation number for NFS */
__u32 di_flags; /* GFS2_DIF_... */ __u32 di_flags; /* GFS2_DIF_... */
__u32 di_payload_format; /* GFS2_FORMAT_... */
__u16 di_height; /* height of metadata */ __u16 di_height; /* height of metadata */
/* These only apply to directories */ /* These only apply to directories */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment