diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-31 15:07:05 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-11-30 10:33:54 -0500 |
commit | 539e5d6b7ae8612c0393fe940d2da5b591318d3d (patch) | |
tree | 3ae6afd9c47a9a08e87877988d1c47bc060d71bf /fs/gfs2/bmap.c | |
parent | 9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196 (diff) |
[GFS2] Change argument of gfs2_dinode_out
Everywhere this was called, a struct gfs2_inode was available,
but despite that, it was always called with a struct gfs2_dinode
as an argument. By making this change it paves the way to start
eliminating fields duplicated between the kernel's struct inode
and the struct gfs2_dinode.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/bmap.c')
-rw-r--r-- | fs/gfs2/bmap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 51f6356bdcb5..8c092ab2b4ba 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c | |||
@@ -498,7 +498,7 @@ static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create, | |||
498 | error = gfs2_meta_inode_buffer(ip, &dibh); | 498 | error = gfs2_meta_inode_buffer(ip, &dibh); |
499 | if (!error) { | 499 | if (!error) { |
500 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 500 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
501 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 501 | gfs2_dinode_out(ip, dibh->b_data); |
502 | brelse(dibh); | 502 | brelse(dibh); |
503 | } | 503 | } |
504 | set_buffer_new(bh_map); | 504 | set_buffer_new(bh_map); |
@@ -780,7 +780,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, | |||
780 | 780 | ||
781 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); | 781 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); |
782 | 782 | ||
783 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 783 | gfs2_dinode_out(ip, dibh->b_data); |
784 | 784 | ||
785 | up_write(&ip->i_rw_mutex); | 785 | up_write(&ip->i_rw_mutex); |
786 | 786 | ||
@@ -860,7 +860,7 @@ static int do_grow(struct gfs2_inode *ip, u64 size) | |||
860 | goto out_end_trans; | 860 | goto out_end_trans; |
861 | 861 | ||
862 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 862 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
863 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 863 | gfs2_dinode_out(ip, dibh->b_data); |
864 | brelse(dibh); | 864 | brelse(dibh); |
865 | 865 | ||
866 | out_end_trans: | 866 | out_end_trans: |
@@ -970,7 +970,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) | |||
970 | ip->i_di.di_size = size; | 970 | ip->i_di.di_size = size; |
971 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); | 971 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); |
972 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 972 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
973 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 973 | gfs2_dinode_out(ip, dibh->b_data); |
974 | gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size); | 974 | gfs2_buffer_clear_tail(dibh, sizeof(struct gfs2_dinode) + size); |
975 | error = 1; | 975 | error = 1; |
976 | 976 | ||
@@ -983,7 +983,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) | |||
983 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); | 983 | ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); |
984 | ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG; | 984 | ip->i_di.di_flags |= GFS2_DIF_TRUNC_IN_PROG; |
985 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 985 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
986 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 986 | gfs2_dinode_out(ip, dibh->b_data); |
987 | } | 987 | } |
988 | } | 988 | } |
989 | 989 | ||
@@ -1057,7 +1057,7 @@ static int trunc_end(struct gfs2_inode *ip) | |||
1057 | ip->i_di.di_flags &= ~GFS2_DIF_TRUNC_IN_PROG; | 1057 | ip->i_di.di_flags &= ~GFS2_DIF_TRUNC_IN_PROG; |
1058 | 1058 | ||
1059 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 1059 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
1060 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 1060 | gfs2_dinode_out(ip, dibh->b_data); |
1061 | brelse(dibh); | 1061 | brelse(dibh); |
1062 | 1062 | ||
1063 | out: | 1063 | out: |