aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
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
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')
-rw-r--r--fs/gfs2/acl.c2
-rw-r--r--fs/gfs2/bmap.c12
-rw-r--r--fs/gfs2/dir.c20
-rw-r--r--fs/gfs2/eattr.c14
-rw-r--r--fs/gfs2/inode.c6
-rw-r--r--fs/gfs2/ondisk.c5
-rw-r--r--fs/gfs2/ops_file.c2
-rw-r--r--fs/gfs2/ops_inode.c10
8 files changed, 37 insertions, 34 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 5f959b8ce406..906e403b054f 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -201,7 +201,7 @@ static int munge_mode(struct gfs2_inode *ip, mode_t mode)
201 (ip->i_di.di_mode & S_IFMT) == (mode & S_IFMT)); 201 (ip->i_di.di_mode & S_IFMT) == (mode & S_IFMT));
202 ip->i_di.di_mode = mode; 202 ip->i_di.di_mode = mode;
203 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 203 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
204 gfs2_dinode_out(&ip->i_di, dibh->b_data); 204 gfs2_dinode_out(ip, dibh->b_data);
205 brelse(dibh); 205 brelse(dibh);
206 } 206 }
207 207
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
866out_end_trans: 866out_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
1063out: 1063out:
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:
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index 518f0c0786c8..9b7bb565b59d 100644
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -302,7 +302,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
302 if (!error) { 302 if (!error) {
303 ip->i_di.di_ctime = get_seconds(); 303 ip->i_di.di_ctime = get_seconds();
304 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 304 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
305 gfs2_dinode_out(&ip->i_di, dibh->b_data); 305 gfs2_dinode_out(ip, dibh->b_data);
306 brelse(dibh); 306 brelse(dibh);
307 } 307 }
308 308
@@ -717,7 +717,7 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er,
717 } 717 }
718 ip->i_di.di_ctime = get_seconds(); 718 ip->i_di.di_ctime = get_seconds();
719 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 719 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
720 gfs2_dinode_out(&ip->i_di, dibh->b_data); 720 gfs2_dinode_out(ip, dibh->b_data);
721 brelse(dibh); 721 brelse(dibh);
722 } 722 }
723 723
@@ -852,7 +852,7 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh,
852 } 852 }
853 ip->i_di.di_ctime = get_seconds(); 853 ip->i_di.di_ctime = get_seconds();
854 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 854 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
855 gfs2_dinode_out(&ip->i_di, dibh->b_data); 855 gfs2_dinode_out(ip, dibh->b_data);
856 brelse(dibh); 856 brelse(dibh);
857out: 857out:
858 gfs2_trans_end(GFS2_SB(&ip->i_inode)); 858 gfs2_trans_end(GFS2_SB(&ip->i_inode));
@@ -1132,7 +1132,7 @@ static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el)
1132 if (!error) { 1132 if (!error) {
1133 ip->i_di.di_ctime = get_seconds(); 1133 ip->i_di.di_ctime = get_seconds();
1134 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 1134 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
1135 gfs2_dinode_out(&ip->i_di, dibh->b_data); 1135 gfs2_dinode_out(ip, dibh->b_data);
1136 brelse(dibh); 1136 brelse(dibh);
1137 } 1137 }
1138 1138
@@ -1287,7 +1287,7 @@ int gfs2_ea_acl_chmod(struct gfs2_inode *ip, struct gfs2_ea_location *el,
1287 gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error); 1287 gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
1288 gfs2_inode_attr_out(ip); 1288 gfs2_inode_attr_out(ip);
1289 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 1289 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
1290 gfs2_dinode_out(&ip->i_di, dibh->b_data); 1290 gfs2_dinode_out(ip, dibh->b_data);
1291 brelse(dibh); 1291 brelse(dibh);
1292 } 1292 }
1293 1293
@@ -1397,7 +1397,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
1397 error = gfs2_meta_inode_buffer(ip, &dibh); 1397 error = gfs2_meta_inode_buffer(ip, &dibh);
1398 if (!error) { 1398 if (!error) {
1399 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 1399 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
1400 gfs2_dinode_out(&ip->i_di, dibh->b_data); 1400 gfs2_dinode_out(ip, dibh->b_data);
1401 brelse(dibh); 1401 brelse(dibh);
1402 } 1402 }
1403 1403
@@ -1446,7 +1446,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
1446 error = gfs2_meta_inode_buffer(ip, &dibh); 1446 error = gfs2_meta_inode_buffer(ip, &dibh);
1447 if (!error) { 1447 if (!error) {
1448 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 1448 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
1449 gfs2_dinode_out(&ip->i_di, dibh->b_data); 1449 gfs2_dinode_out(ip, dibh->b_data);
1450 brelse(dibh); 1450 brelse(dibh);
1451 } 1451 }
1452 1452
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index fb969302f181..b861ddba8688 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -338,7 +338,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
338 ip->i_inode.i_nlink = nlink; 338 ip->i_inode.i_nlink = nlink;
339 339
340 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 340 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
341 gfs2_dinode_out(&ip->i_di, dibh->b_data); 341 gfs2_dinode_out(ip, dibh->b_data);
342 brelse(dibh); 342 brelse(dibh);
343 mark_inode_dirty(&ip->i_inode); 343 mark_inode_dirty(&ip->i_inode);
344 344
@@ -792,7 +792,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name,
792 goto fail_end_trans; 792 goto fail_end_trans;
793 ip->i_di.di_nlink = 1; 793 ip->i_di.di_nlink = 1;
794 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 794 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
795 gfs2_dinode_out(&ip->i_di, dibh->b_data); 795 gfs2_dinode_out(ip, dibh->b_data);
796 brelse(dibh); 796 brelse(dibh);
797 return 0; 797 return 0;
798 798
@@ -1349,7 +1349,7 @@ __gfs2_setattr_simple(struct gfs2_inode *ip, struct iattr *attr)
1349 gfs2_inode_attr_out(ip); 1349 gfs2_inode_attr_out(ip);
1350 1350
1351 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 1351 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
1352 gfs2_dinode_out(&ip->i_di, dibh->b_data); 1352 gfs2_dinode_out(ip, dibh->b_data);
1353 brelse(dibh); 1353 brelse(dibh);
1354 } 1354 }
1355 return error; 1355 return error;
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 2d1682ded4b7..2c50fa0261f5 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -15,6 +15,8 @@
15 15
16#include "gfs2.h" 16#include "gfs2.h"
17#include <linux/gfs2_ondisk.h> 17#include <linux/gfs2_ondisk.h>
18#include <linux/lm_interface.h>
19#include "incore.h"
18 20
19#define pv(struct, member, fmt) printk(KERN_INFO " "#member" = "fmt"\n", \ 21#define pv(struct, member, fmt) printk(KERN_INFO " "#member" = "fmt"\n", \
20 struct->member); 22 struct->member);
@@ -187,8 +189,9 @@ void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf)
187 189
188} 190}
189 191
190void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf) 192void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf)
191{ 193{
194 const struct gfs2_dinode_host *di = &ip->i_di;
192 struct gfs2_dinode *str = buf; 195 struct gfs2_dinode *str = buf;
193 196
194 gfs2_meta_header_out(&di->di_header, buf); 197 gfs2_meta_header_out(&di->di_header, buf);
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 2fc8868e065c..7ea417573903 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -336,7 +336,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
336 goto out_trans_end; 336 goto out_trans_end;
337 gfs2_trans_add_bh(ip->i_gl, bh, 1); 337 gfs2_trans_add_bh(ip->i_gl, bh, 1);
338 ip->i_di.di_flags = new_flags; 338 ip->i_di.di_flags = new_flags;
339 gfs2_dinode_out(&ip->i_di, bh->b_data); 339 gfs2_dinode_out(ip, bh->b_data);
340 brelse(bh); 340 brelse(bh);
341out_trans_end: 341out_trans_end:
342 gfs2_trans_end(sdp); 342 gfs2_trans_end(sdp);
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index ef6e5ed70e94..bd268852c674 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -339,7 +339,7 @@ static int gfs2_symlink(struct inode *dir, struct dentry *dentry,
339 error = gfs2_meta_inode_buffer(ip, &dibh); 339 error = gfs2_meta_inode_buffer(ip, &dibh);
340 340
341 if (!gfs2_assert_withdraw(sdp, !error)) { 341 if (!gfs2_assert_withdraw(sdp, !error)) {
342 gfs2_dinode_out(&ip->i_di, dibh->b_data); 342 gfs2_dinode_out(ip, dibh->b_data);
343 memcpy(dibh->b_data + sizeof(struct gfs2_dinode), symname, 343 memcpy(dibh->b_data + sizeof(struct gfs2_dinode), symname,
344 size); 344 size);
345 brelse(dibh); 345 brelse(dibh);
@@ -414,7 +414,7 @@ static int gfs2_mkdir(struct inode *dir, struct dentry *dentry, int mode)
414 gfs2_inum_out(&dip->i_num, &dent->de_inum); 414 gfs2_inum_out(&dip->i_num, &dent->de_inum);
415 dent->de_type = cpu_to_be16(DT_DIR); 415 dent->de_type = cpu_to_be16(DT_DIR);
416 416
417 gfs2_dinode_out(&ip->i_di, di); 417 gfs2_dinode_out(ip, di);
418 418
419 brelse(dibh); 419 brelse(dibh);
420 } 420 }
@@ -541,7 +541,7 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode,
541 error = gfs2_meta_inode_buffer(ip, &dibh); 541 error = gfs2_meta_inode_buffer(ip, &dibh);
542 542
543 if (!gfs2_assert_withdraw(sdp, !error)) { 543 if (!gfs2_assert_withdraw(sdp, !error)) {
544 gfs2_dinode_out(&ip->i_di, dibh->b_data); 544 gfs2_dinode_out(ip, dibh->b_data);
545 brelse(dibh); 545 brelse(dibh);
546 } 546 }
547 547
@@ -762,7 +762,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
762 goto out_end_trans; 762 goto out_end_trans;
763 ip->i_di.di_ctime = get_seconds(); 763 ip->i_di.di_ctime = get_seconds();
764 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 764 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
765 gfs2_dinode_out(&ip->i_di, dibh->b_data); 765 gfs2_dinode_out(ip, dibh->b_data);
766 brelse(dibh); 766 brelse(dibh);
767 } 767 }
768 768
@@ -949,7 +949,7 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
949 gfs2_inode_attr_out(ip); 949 gfs2_inode_attr_out(ip);
950 950
951 gfs2_trans_add_bh(ip->i_gl, dibh, 1); 951 gfs2_trans_add_bh(ip->i_gl, dibh, 1);
952 gfs2_dinode_out(&ip->i_di, dibh->b_data); 952 gfs2_dinode_out(ip, dibh->b_data);
953 brelse(dibh); 953 brelse(dibh);
954 954
955 if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) { 955 if (ouid != NO_QUOTA_CHANGE || ogid != NO_QUOTA_CHANGE) {