diff options
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/inode.c | 8 | ||||
-rw-r--r-- | fs/gfs2/ondisk.c | 4 | ||||
-rw-r--r-- | fs/gfs2/ops_inode.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b39cfcfe9276..4c5d286fefdb 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -269,7 +269,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip) | |||
269 | 269 | ||
270 | if (ip->i_num.no_addr != ip->i_di.di_num.no_addr) { | 270 | if (ip->i_num.no_addr != ip->i_di.di_num.no_addr) { |
271 | if (gfs2_consist_inode(ip)) | 271 | if (gfs2_consist_inode(ip)) |
272 | gfs2_dinode_print(&ip->i_di); | 272 | gfs2_dinode_print(ip); |
273 | return -EIO; | 273 | return -EIO; |
274 | } | 274 | } |
275 | if (ip->i_num.no_formal_ino != ip->i_di.di_num.no_formal_ino) | 275 | if (ip->i_num.no_formal_ino != ip->i_di.di_num.no_formal_ino) |
@@ -289,7 +289,7 @@ int gfs2_dinode_dealloc(struct gfs2_inode *ip) | |||
289 | 289 | ||
290 | if (ip->i_di.di_blocks != 1) { | 290 | if (ip->i_di.di_blocks != 1) { |
291 | if (gfs2_consist_inode(ip)) | 291 | if (gfs2_consist_inode(ip)) |
292 | gfs2_dinode_print(&ip->i_di); | 292 | gfs2_dinode_print(ip); |
293 | return -EIO; | 293 | return -EIO; |
294 | } | 294 | } |
295 | 295 | ||
@@ -359,7 +359,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff) | |||
359 | bigger than the old one, we must have underflowed. */ | 359 | bigger than the old one, we must have underflowed. */ |
360 | if (diff < 0 && nlink > ip->i_di.di_nlink) { | 360 | if (diff < 0 && nlink > ip->i_di.di_nlink) { |
361 | if (gfs2_consist_inode(ip)) | 361 | if (gfs2_consist_inode(ip)) |
362 | gfs2_dinode_print(&ip->i_di); | 362 | gfs2_dinode_print(ip); |
363 | return -EIO; | 363 | return -EIO; |
364 | } | 364 | } |
365 | 365 | ||
@@ -1010,7 +1010,7 @@ int gfs2_rmdiri(struct gfs2_inode *dip, const struct qstr *name, | |||
1010 | 1010 | ||
1011 | if (ip->i_di.di_entries != 2) { | 1011 | if (ip->i_di.di_entries != 2) { |
1012 | if (gfs2_consist_inode(ip)) | 1012 | if (gfs2_consist_inode(ip)) |
1013 | gfs2_dinode_print(&ip->i_di); | 1013 | gfs2_dinode_print(ip); |
1014 | return -EIO; | 1014 | return -EIO; |
1015 | } | 1015 | } |
1016 | 1016 | ||
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index 062a44f87fec..77bed440833d 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c | |||
@@ -190,8 +190,10 @@ void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf) | |||
190 | 190 | ||
191 | } | 191 | } |
192 | 192 | ||
193 | void gfs2_dinode_print(const struct gfs2_dinode_host *di) | 193 | void gfs2_dinode_print(const struct gfs2_inode *ip) |
194 | { | 194 | { |
195 | const struct gfs2_dinode_host *di = &ip->i_di; | ||
196 | |||
195 | gfs2_meta_header_print(&di->di_header); | 197 | gfs2_meta_header_print(&di->di_header); |
196 | gfs2_inum_print(&di->di_num); | 198 | gfs2_inum_print(&di->di_num); |
197 | 199 | ||
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index bd268852c674..b2c2fe613d70 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
@@ -467,7 +467,7 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry) | |||
467 | 467 | ||
468 | if (ip->i_di.di_entries < 2) { | 468 | if (ip->i_di.di_entries < 2) { |
469 | if (gfs2_consist_inode(ip)) | 469 | if (gfs2_consist_inode(ip)) |
470 | gfs2_dinode_print(&ip->i_di); | 470 | gfs2_dinode_print(ip); |
471 | error = -EIO; | 471 | error = -EIO; |
472 | goto out_gunlock; | 472 | goto out_gunlock; |
473 | } | 473 | } |
@@ -640,7 +640,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, | |||
640 | if (S_ISDIR(nip->i_di.di_mode)) { | 640 | if (S_ISDIR(nip->i_di.di_mode)) { |
641 | if (nip->i_di.di_entries < 2) { | 641 | if (nip->i_di.di_entries < 2) { |
642 | if (gfs2_consist_inode(nip)) | 642 | if (gfs2_consist_inode(nip)) |
643 | gfs2_dinode_print(&nip->i_di); | 643 | gfs2_dinode_print(nip); |
644 | error = -EIO; | 644 | error = -EIO; |
645 | goto out_gunlock; | 645 | goto out_gunlock; |
646 | } | 646 | } |