Re: [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]

[Russell Cattelan <cattelan@thebarn.com>]

On Thu, 2006-11-30 at 12:16 +0000, Steven Whitehouse wrote:
> >From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
> From: Steven Whitehouse <swhiteho@redhat.com>
> Date: Wed, 1 Nov 2006 14:35:17 -0500
> Subject: [PATCH] [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime
> 
> Remove the di_[amc]time fields and use inode->i_[amc]time
> fields instead. This saves 24 bytes from the gfs2_inode.

More of the data structure clean up work? That is 
incomplete?


> 
> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
> ---
>  fs/gfs2/bmap.c              |   10 +++++-----
>  fs/gfs2/dir.c               |   10 +++++-----
>  fs/gfs2/eattr.c             |    9 ++++-----
>  fs/gfs2/inode.c             |   44 +++++++++++--------------------------------
>  fs/gfs2/inode.h             |    1 -
>  fs/gfs2/ondisk.c            |   10 +++-------
>  fs/gfs2/ops_address.c       |    4 ----
>  fs/gfs2/ops_inode.c         |    3 +--
>  include/linux/gfs2_ondisk.h |    3 ---
>  9 files changed, 29 insertions(+), 65 deletions(-)
> 
> diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
> index 0c913ee..692d4a3 100644
> --- a/fs/gfs2/bmap.c
> +++ b/fs/gfs2/bmap.c
> @@ -778,7 +778,7 @@ static int do_strip(struct gfs2_inode *i
>  			gfs2_free_data(ip, bstart, blen);
>  	}
>  
> -	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  
>  	gfs2_dinode_out(ip, dibh->b_data);
>  
> @@ -853,7 +853,7 @@ static int do_grow(struct gfs2_inode *ip
>  	}
>  
>  	ip->i_di.di_size = size;
> -	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  
>  	error = gfs2_meta_inode_buffer(ip, &dibh);
>  	if (error)
> @@ -968,7 +968,7 @@ static int trunc_start(struct gfs2_inode
>  
>  	if (gfs2_is_stuffed(ip)) {
>  		ip->i_di.di_size = size;
> -		ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +		ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size);
> @@ -980,7 +980,7 @@ static int trunc_start(struct gfs2_inode
>  
>  		if (!error) {
>  			ip->i_di.di_size = size;
> -			ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +			ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  			ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG;
>  			gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  			gfs2_dinode_out(ip, dibh->b_data);
> @@ -1053,7 +1053,7 @@ static int trunc_end(struct gfs2_inode *
>  			ip->i_num.no_addr;
>  		gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode));
>  	}
> -	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  	ip->i_di.di_flags &= ~GFS2_DIF_TRUNC_IN_PROG;
>  
>  	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
> diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
> index 0742761..ca23c8b 100644
> --- a/fs/gfs2/dir.c
> +++ b/fs/gfs2/dir.c
> @@ -131,7 +131,7 @@ static int gfs2_dir_write_stuffed(struct
>  	memcpy(dibh->b_data + offset + sizeof(struct gfs2_dinode), buf, size);
>  	if (ip->i_di.di_size < offset + size)
>  		ip->i_di.di_size = offset + size;
> -	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  	gfs2_dinode_out(ip, dibh->b_data);
>  
>  	brelse(dibh);
> @@ -229,7 +229,7 @@ out:
>  
>  	if (ip->i_di.di_size < offset + copied)
>  		ip->i_di.di_size = offset + copied;
> -	ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  
>  	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  	gfs2_dinode_out(ip, dibh->b_data);
> @@ -1560,7 +1560,7 @@ int gfs2_dir_add(struct inode *inode, co
>  				break;
>  			gfs2_trans_add_bh(ip->i_gl, bh, 1);
>  			ip->i_di.di_entries++;
> -			ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
> +			ip->i_inode.i_mtime.tv_sec = ip->i_inode.i_ctime.tv_sec = get_seconds();
>  			gfs2_dinode_out(ip, bh->b_data);
>  			brelse(bh);
>  			error = 0;
> @@ -1646,7 +1646,7 @@ int gfs2_dir_del(struct gfs2_inode *dip,
>  		gfs2_consist_inode(dip);
>  	gfs2_trans_add_bh(dip->i_gl, bh, 1);
>  	dip->i_di.di_entries--;
> -	dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();
> +	dip->i_inode.i_mtime.tv_sec = dip->i_inode.i_ctime.tv_sec = get_seconds();
>  	gfs2_dinode_out(dip, bh->b_data);
>  	brelse(bh);
>  	mark_inode_dirty(&dip->i_inode);
> @@ -1694,7 +1694,7 @@ int gfs2_dir_mvino(struct gfs2_inode *di
>  		gfs2_trans_add_bh(dip->i_gl, bh, 1);
>  	}
>  
> -	dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();
> +	dip->i_inode.i_mtime.tv_sec = dip->i_inode.i_ctime.tv_sec = get_seconds();
>  	gfs2_dinode_out(dip, bh->b_data);
>  	brelse(bh);
>  	return 0;
> diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
> index 935cc9a..7dde847 100644
> --- a/fs/gfs2/eattr.c
> +++ b/fs/gfs2/eattr.c
> @@ -300,7 +300,7 @@ static int ea_dealloc_unstuffed(struct g
>  
>  	error = gfs2_meta_inode_buffer(ip, &dibh);
>  	if (!error) {
> -		ip->i_di.di_ctime = get_seconds();
> +		ip->i_inode.i_ctime.tv_sec = get_seconds();
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> @@ -715,7 +715,7 @@ static int ea_alloc_skeleton(struct gfs2
>  					    (er->er_mode & S_IFMT));
>  			ip->i_inode.i_mode = er->er_mode;
>  		}
> -		ip->i_di.di_ctime = get_seconds();
> +		ip->i_inode.i_ctime.tv_sec = get_seconds();
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> @@ -850,7 +850,7 @@ static int ea_set_simple_noalloc(struct 
>  			(ip->i_inode.i_mode & S_IFMT) == (er->er_mode & S_IFMT));
>  		ip->i_inode.i_mode = er->er_mode;
>  	}
> -	ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_ctime.tv_sec = get_seconds();
>  	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  	gfs2_dinode_out(ip, dibh->b_data);
>  	brelse(dibh);
> @@ -1130,7 +1130,7 @@ static int ea_remove_stuffed(struct gfs2
>  
>  	error = gfs2_meta_inode_buffer(ip, &dibh);
>  	if (!error) {
> -		ip->i_di.di_ctime = get_seconds();
> +		ip->i_inode.i_ctime.tv_sec = get_seconds();
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> @@ -1285,7 +1285,6 @@ int gfs2_ea_acl_chmod(struct gfs2_inode 
>  	if (!error) {
>  		error = inode_setattr(&ip->i_inode, attr);
>  		gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
> -		gfs2_inode_attr_out(ip);
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index 7112039..c22ae3c 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -52,12 +52,6 @@ void gfs2_inode_attr_in(struct gfs2_inod
>  
>  	inode->i_ino = ip->i_num.no_addr;
>  	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_blocks = di->di_blocks <<
>  		(GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);
>  
> @@ -72,23 +66,6 @@ void gfs2_inode_attr_in(struct gfs2_inod
>  		inode->i_flags &= ~S_APPEND;
>  }
>  
> -/**
> - * gfs2_inode_attr_out - Copy attributes from VFS inode into the dinode
> - * @ip: The GFS2 inode
> - *
> - * Only copy out the attributes that we want the VFS layer
> - * to be able to modify.
> - */
> -
> -void gfs2_inode_attr_out(struct gfs2_inode *ip)
> -{
> -	struct inode *inode = &ip->i_inode;
> -	struct gfs2_dinode_host *di = &ip->i_di;
> -	di->di_atime = inode->i_atime.tv_sec;
> -	di->di_mtime = inode->i_mtime.tv_sec;
> -	di->di_ctime = inode->i_ctime.tv_sec;
> -}
> -
>  static int iget_test(struct inode *inode, void *opaque)
>  {
>  	struct gfs2_inode *ip = GFS2_I(inode);
> @@ -221,9 +198,12 @@ static int gfs2_dinode_in(struct gfs2_in
>  	ip->i_inode.i_nlink = be32_to_cpu(str->di_nlink);
>  	di->di_size = be64_to_cpu(str->di_size);
>  	di->di_blocks = be64_to_cpu(str->di_blocks);
> -	di->di_atime = be64_to_cpu(str->di_atime);
> -	di->di_mtime = be64_to_cpu(str->di_mtime);
> -	di->di_ctime = be64_to_cpu(str->di_ctime);
> +	ip->i_inode.i_atime.tv_sec = be64_to_cpu(str->di_atime);
> +	ip->i_inode.i_atime.tv_nsec = 0;
> +	ip->i_inode.i_mtime.tv_sec = be64_to_cpu(str->di_mtime);
> +	ip->i_inode.i_mtime.tv_nsec = 0;
> +	ip->i_inode.i_ctime.tv_sec = be64_to_cpu(str->di_ctime);
> +	ip->i_inode.i_ctime.tv_nsec = 0;
>  
>  	di->di_goal_meta = be64_to_cpu(str->di_goal_meta);
>  	di->di_goal_data = be64_to_cpu(str->di_goal_data);
> @@ -360,7 +340,7 @@ int gfs2_change_nlink(struct gfs2_inode 
>  	else
>  		drop_nlink(&ip->i_inode);
>  
> -	ip->i_di.di_ctime = get_seconds();
> +	ip->i_inode.i_ctime.tv_sec = get_seconds();
>  
>  	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  	gfs2_dinode_out(ip, dibh->b_data);
> @@ -1224,7 +1204,7 @@ int gfs2_glock_nq_atime(struct gfs2_hold
>  		return 0;
>  
>  	curtime = get_seconds();
> -	if (curtime - ip->i_di.di_atime >= quantum) {
> +	if (curtime - ip->i_inode.i_atime.tv_sec >= quantum) {
>  		gfs2_glock_dq(gh);
>  		gfs2_holder_reinit(LM_ST_EXCLUSIVE, gh->gh_flags & ~LM_FLAG_ANY,
>  				   gh);
> @@ -1236,7 +1216,7 @@ int gfs2_glock_nq_atime(struct gfs2_hold
>  		   trying to get exclusive lock. */
>  
>  		curtime = get_seconds();
> -		if (curtime - ip->i_di.di_atime >= quantum) {
> +		if (curtime - ip->i_inode.i_atime.tv_sec >= quantum) {
>  			struct buffer_head *dibh;
>  			struct gfs2_dinode *di;
>  
> @@ -1250,11 +1230,11 @@ int gfs2_glock_nq_atime(struct gfs2_hold
>  			if (error)
>  				goto fail_end_trans;
>  
> -			ip->i_di.di_atime = curtime;
> +			ip->i_inode.i_atime.tv_sec = curtime;
>  
>  			gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  			di = (struct gfs2_dinode *)dibh->b_data;
> -			di->di_atime = cpu_to_be64(ip->i_di.di_atime);
> +			di->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec);
>  			brelse(dibh);
>  
>  			gfs2_trans_end(sdp);
> @@ -1375,8 +1355,6 @@ __gfs2_setattr_simple(struct gfs2_inode 
>  	if (!error) {
>  		error = inode_setattr(&ip->i_inode, attr);
>  		gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
> -		gfs2_inode_attr_out(ip);
> -
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h
> index 69cbf98..54d584e 100644
> --- a/fs/gfs2/inode.h
> +++ b/fs/gfs2/inode.h
> @@ -26,7 +26,6 @@ static inline int gfs2_is_dir(struct gfs
>  }
>  
>  void gfs2_inode_attr_in(struct gfs2_inode *ip);
> -void gfs2_inode_attr_out(struct gfs2_inode *ip);
>  struct inode *gfs2_inode_lookup(struct super_block *sb, struct gfs2_inum_host *inum, unsigned type);
>  struct inode *gfs2_ilookup(struct super_block *sb, struct gfs2_inum_host *inum);
>  
> diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
> index b4e354b..82003e8 100644
> --- a/fs/gfs2/ondisk.c
> +++ b/fs/gfs2/ondisk.c
> @@ -167,9 +167,9 @@ void gfs2_dinode_out(const struct gfs2_i
>  	str->di_nlink = cpu_to_be32(ip->i_inode.i_nlink);
>  	str->di_size = cpu_to_be64(di->di_size);
>  	str->di_blocks = cpu_to_be64(di->di_blocks);
> -	str->di_atime = cpu_to_be64(di->di_atime);
> -	str->di_mtime = cpu_to_be64(di->di_mtime);
> -	str->di_ctime = cpu_to_be64(di->di_ctime);
> +	str->di_atime = cpu_to_be64(ip->i_inode.i_atime.tv_sec);
> +	str->di_mtime = cpu_to_be64(ip->i_inode.i_mtime.tv_sec);
> +	str->di_ctime = cpu_to_be64(ip->i_inode.i_ctime.tv_sec);
>  
>  	str->di_goal_meta = cpu_to_be64(di->di_goal_meta);
>  	str->di_goal_data = cpu_to_be64(di->di_goal_data);
> @@ -193,10 +193,6 @@ void gfs2_dinode_print(const struct gfs2
>  
>  	printk(KERN_INFO "  di_size = %llu\n", (unsigned long long)di->di_size);
>  	printk(KERN_INFO "  di_blocks = %llu\n", (unsigned long long)di->di_blocks);
> -	printk(KERN_INFO "  di_atime = %lld\n", (long long)di->di_atime);
> -	printk(KERN_INFO "  di_mtime = %lld\n", (long long)di->di_mtime);
> -	printk(KERN_INFO "  di_ctime = %lld\n", (long long)di->di_ctime);
> -
>  	printk(KERN_INFO "  di_goal_meta = %llu\n", (unsigned long long)di->di_goal_meta);
>  	printk(KERN_INFO "  di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
>  
> diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
> index 38b702a..5c3962c 100644
> --- a/fs/gfs2/ops_address.c
> +++ b/fs/gfs2/ops_address.c
> @@ -498,10 +498,6 @@ static int gfs2_commit_write(struct file
>  		di->di_size = cpu_to_be64(inode->i_size);
>  	}
>  
> -	di->di_atime = cpu_to_be64(inode->i_atime.tv_sec);
> -	di->di_mtime = cpu_to_be64(inode->i_mtime.tv_sec);
> -	di->di_ctime = cpu_to_be64(inode->i_ctime.tv_sec);
> -
>  	brelse(dibh);
>  	gfs2_trans_end(sdp);
>  	if (al->al_requested) {
> diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
> index 06176de..585b43a 100644
> --- a/fs/gfs2/ops_inode.c
> +++ b/fs/gfs2/ops_inode.c
> @@ -729,7 +729,7 @@ static int gfs2_rename(struct inode *odi
>  		error = gfs2_meta_inode_buffer(ip, &dibh);
>  		if (error)
>  			goto out_end_trans;
> -		ip->i_di.di_ctime = get_seconds();
> +		ip->i_inode.i_ctime.tv_sec = get_seconds();
>  		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  		gfs2_dinode_out(ip, dibh->b_data);
>  		brelse(dibh);
> @@ -915,7 +915,6 @@ static int setattr_chown(struct inode *i
>  
>  	error = inode_setattr(inode, attr);
>  	gfs2_assert_warn(sdp, !error);
> -	gfs2_inode_attr_out(ip);
>  
>  	gfs2_trans_add_bh(ip->i_gl, dibh, 1);
>  	gfs2_dinode_out(ip, dibh->b_data);
> diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
> index c61517b..7f5a4a1 100644
> --- a/include/linux/gfs2_ondisk.h
> +++ b/include/linux/gfs2_ondisk.h
> @@ -324,9 +324,6 @@ struct gfs2_dinode {
>  struct gfs2_dinode_host {
>  	__u64 di_size;	/* number of bytes in file */
>  	__u64 di_blocks;	/* number of blocks in file */
> -	__u64 di_atime;	/* time last accessed */
> -	__u64 di_mtime;	/* time last modified */
> -	__u64 di_ctime;	/* time last changed */
>  
>  	/* This section varies from gfs1. Padding added to align with
>           * remainder of dinode
-- 
Russell Cattelan <cattelan@thebarn.com>

Attachment: signature.asc
Description: This is a digitally signed message part