aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/dir.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-10-31 15:07:05 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-11-30 10:33:54 -0500
commit539e5d6b7ae8612c0393fe940d2da5b591318d3d (patch)
tree3ae6afd9c47a9a08e87877988d1c47bc060d71bf /fs/gfs2/dir.c
parent9c9ab3d5414653bfe5e5b9f4dfdaab0c6ab17196 (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/dir.c')
-rw-r--r--fs/gfs2/dir.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 59dc823c2833..0742761e1e02 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -132,7 +132,7 @@ static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf,
132 if (ip->i_di.di_size < offset + size) 132 if (ip->i_di.di_size < offset + size)
133 ip->i_di.di_size = offset + size; 133 ip->i_di.di_size = offset + size;
134 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); 134 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
135 gfs2_dinode_out(&ip->i_di, dibh->b_data); 135 gfs2_dinode_out(ip, dibh->b_data);
136 136
137 brelse(dibh); 137 brelse(dibh);
138 138
@@ -232,7 +232,7 @@ out:
232 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); 232 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
233 233
234 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 234 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
235 gfs2_dinode_out(&ip->i_di, dibh->b_data); 235 gfs2_dinode_out(ip, dibh->b_data);
236 brelse(dibh); 236 brelse(dibh);
237 237
238 return copied; 238 return copied;
@@ -907,7 +907,7 @@ static int dir_make_exhash(struct inode *inode)
907 for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ; 907 for (x = sdp->sd_hash_ptrs, y = -1; x; x >>= 1, y++) ;
908 dip->i_di.di_depth = y; 908 dip->i_di.di_depth = y;
909 909
910 gfs2_dinode_out(&dip->i_di, dibh->b_data); 910 gfs2_dinode_out(dip, dibh->b_data);
911 911
912 brelse(dibh); 912 brelse(dibh);
913 913
@@ -1039,7 +1039,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
1039 error = gfs2_meta_inode_buffer(dip, &dibh); 1039 error = gfs2_meta_inode_buffer(dip, &dibh);
1040 if (!gfs2_assert_withdraw(GFS2_SB(&dip->i_inode), !error)) { 1040 if (!gfs2_assert_withdraw(GFS2_SB(&dip->i_inode), !error)) {
1041 dip->i_di.di_blocks++; 1041 dip->i_di.di_blocks++;
1042 gfs2_dinode_out(&dip->i_di, dibh->b_data); 1042 gfs2_dinode_out(dip, dibh->b_data);
1043 brelse(dibh); 1043 brelse(dibh);
1044 } 1044 }
1045 1045
@@ -1119,7 +1119,7 @@ static int dir_double_exhash(struct gfs2_inode *dip)
1119 error = gfs2_meta_inode_buffer(dip, &dibh); 1119 error = gfs2_meta_inode_buffer(dip, &dibh);
1120 if (!gfs2_assert_withdraw(sdp, !error)) { 1120 if (!gfs2_assert_withdraw(sdp, !error)) {
1121 dip->i_di.di_depth++; 1121 dip->i_di.di_depth++;
1122 gfs2_dinode_out(&dip->i_di, dibh->b_data); 1122 gfs2_dinode_out(dip, dibh->b_data);
1123 brelse(dibh); 1123 brelse(dibh);
1124 } 1124 }
1125 1125
@@ -1517,7 +1517,7 @@ static int dir_new_leaf(struct inode *inode, const struct qstr *name)
1517 return error; 1517 return error;
1518 gfs2_trans_add_bh(ip->i_gl, bh, 1); 1518 gfs2_trans_add_bh(ip->i_gl, bh, 1);
1519 ip->i_di.di_blocks++; 1519 ip->i_di.di_blocks++;
1520 gfs2_dinode_out(&ip->i_di, bh->b_data); 1520 gfs2_dinode_out(ip, bh->b_data);
1521 brelse(bh); 1521 brelse(bh);
1522 return 0; 1522 return 0;
1523} 1523}
@@ -1561,7 +1561,7 @@ int gfs2_dir_add(struct inode *inode, const struct qstr *name,
1561 gfs2_trans_add_bh(ip->i_gl, bh, 1); 1561 gfs2_trans_add_bh(ip->i_gl, bh, 1);
1562 ip->i_di.di_entries++; 1562 ip->i_di.di_entries++;
1563 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds(); 1563 ip->i_di.di_mtime = ip->i_di.di_ctime = get_seconds();
1564 gfs2_dinode_out(&ip->i_di, bh->b_data); 1564 gfs2_dinode_out(ip, bh->b_data);
1565 brelse(bh); 1565 brelse(bh);
1566 error = 0; 1566 error = 0;
1567 break; 1567 break;
@@ -1647,7 +1647,7 @@ int gfs2_dir_del(struct gfs2_inode *dip, const struct qstr *name)
1647 gfs2_trans_add_bh(dip->i_gl, bh, 1); 1647 gfs2_trans_add_bh(dip->i_gl, bh, 1);
1648 dip->i_di.di_entries--; 1648 dip->i_di.di_entries--;
1649 dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds(); 1649 dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();
1650 gfs2_dinode_out(&dip->i_di, bh->b_data); 1650 gfs2_dinode_out(dip, bh->b_data);
1651 brelse(bh); 1651 brelse(bh);
1652 mark_inode_dirty(&dip->i_inode); 1652 mark_inode_dirty(&dip->i_inode);
1653 1653
@@ -1695,7 +1695,7 @@ int gfs2_dir_mvino(struct gfs2_inode *dip, const struct qstr *filename,
1695 } 1695 }
1696 1696
1697 dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds(); 1697 dip->i_di.di_mtime = dip->i_di.di_ctime = get_seconds();
1698 gfs2_dinode_out(&dip->i_di, bh->b_data); 1698 gfs2_dinode_out(dip, bh->b_data);
1699 brelse(bh); 1699 brelse(bh);
1700 return 0; 1700 return 0;
1701} 1701}
@@ -1875,7 +1875,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
1875 goto out_end_trans; 1875 goto out_end_trans;
1876 1876
1877 gfs2_trans_add_bh(dip->i_gl, dibh, 1); 1877 gfs2_trans_add_bh(dip->i_gl, dibh, 1);
1878 gfs2_dinode_out(&dip->i_di, dibh->b_data); 1878 gfs2_dinode_out(dip, dibh->b_data);
1879 brelse(dibh); 1879 brelse(dibh);
1880 1880
1881out_end_trans: 1881out_end_trans: