Re: [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]
Hi,
On Fri, 2006-12-01 at 12:15 -0600, Russell Cattelan wrote:
> On Thu, 2006-11-30 at 12:16 +, Steven Whitehouse wrote:
> > >From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
> > From: Steven Whitehouse <[EMAIL PROTECTED]>
> > 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?
>
>
I'm afraid I don't understand the point you are making here, although
this is part of the cleanup work as was indicated in the summary email I
sent out,
Steve.
> >
> > Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
> > ---
> > 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, );
> > 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,
Re: [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]
Hi,
On Fri, 2006-12-01 at 12:15 -0600, Russell Cattelan wrote:
On Thu, 2006-11-30 at 12:16 +, Steven Whitehouse wrote:
From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse [EMAIL PROTECTED]
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?
I'm afraid I don't understand the point you are making here, although
this is part of the cleanup work as was indicated in the summary email I
sent out,
Steve.
Signed-off-by: Steven Whitehouse [EMAIL PROTECTED]
---
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--;
-
Re: [GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]
On Thu, 2006-11-30 at 12:16 +, Steven Whitehouse wrote:
> >From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
> From: Steven Whitehouse <[EMAIL PROTECTED]>
> 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 <[EMAIL PROTECTED]>
> ---
> 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, );
> 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();
> +
[GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]
>From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[EMAIL PROTECTED]>
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.
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
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, );
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(>i_inode);
@@ -1694,7 +1694,7 @@ int gfs2_dir_mvino(struct gfs2_inode *di
[GFS2] Shrink gfs2_inode (6) - di_atime/di_mtime/di_ctime [26/70]
From 1a7b1eed5802502fd649e04784becd58557fdcf1 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse [EMAIL PROTECTED]
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.
Signed-off-by: Steven Whitehouse [EMAIL PROTECTED]
---
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);
}
-
