diff options
Diffstat (limited to 'fs/ocfs2/namei.c')
-rw-r--r-- | fs/ocfs2/namei.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 6173807ba23b..084aba86c3b2 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -361,8 +361,8 @@ static int ocfs2_mknod(struct inode *dir, | |||
361 | goto leave; | 361 | goto leave; |
362 | } | 362 | } |
363 | 363 | ||
364 | status = ocfs2_journal_access(handle, dir, parent_fe_bh, | 364 | status = ocfs2_journal_access_di(handle, dir, parent_fe_bh, |
365 | OCFS2_JOURNAL_ACCESS_WRITE); | 365 | OCFS2_JOURNAL_ACCESS_WRITE); |
366 | if (status < 0) { | 366 | if (status < 0) { |
367 | mlog_errno(status); | 367 | mlog_errno(status); |
368 | goto leave; | 368 | goto leave; |
@@ -493,8 +493,8 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, | |||
493 | } | 493 | } |
494 | ocfs2_set_new_buffer_uptodate(inode, *new_fe_bh); | 494 | ocfs2_set_new_buffer_uptodate(inode, *new_fe_bh); |
495 | 495 | ||
496 | status = ocfs2_journal_access(handle, inode, *new_fe_bh, | 496 | status = ocfs2_journal_access_di(handle, inode, *new_fe_bh, |
497 | OCFS2_JOURNAL_ACCESS_CREATE); | 497 | OCFS2_JOURNAL_ACCESS_CREATE); |
498 | if (status < 0) { | 498 | if (status < 0) { |
499 | mlog_errno(status); | 499 | mlog_errno(status); |
500 | goto leave; | 500 | goto leave; |
@@ -664,8 +664,8 @@ static int ocfs2_link(struct dentry *old_dentry, | |||
664 | goto out_unlock_inode; | 664 | goto out_unlock_inode; |
665 | } | 665 | } |
666 | 666 | ||
667 | err = ocfs2_journal_access(handle, inode, fe_bh, | 667 | err = ocfs2_journal_access_di(handle, inode, fe_bh, |
668 | OCFS2_JOURNAL_ACCESS_WRITE); | 668 | OCFS2_JOURNAL_ACCESS_WRITE); |
669 | if (err < 0) { | 669 | if (err < 0) { |
670 | mlog_errno(err); | 670 | mlog_errno(err); |
671 | goto out_commit; | 671 | goto out_commit; |
@@ -851,8 +851,8 @@ static int ocfs2_unlink(struct inode *dir, | |||
851 | goto leave; | 851 | goto leave; |
852 | } | 852 | } |
853 | 853 | ||
854 | status = ocfs2_journal_access(handle, inode, fe_bh, | 854 | status = ocfs2_journal_access_di(handle, inode, fe_bh, |
855 | OCFS2_JOURNAL_ACCESS_WRITE); | 855 | OCFS2_JOURNAL_ACCESS_WRITE); |
856 | if (status < 0) { | 856 | if (status < 0) { |
857 | mlog_errno(status); | 857 | mlog_errno(status); |
858 | goto leave; | 858 | goto leave; |
@@ -1265,8 +1265,8 @@ static int ocfs2_rename(struct inode *old_dir, | |||
1265 | goto bail; | 1265 | goto bail; |
1266 | } | 1266 | } |
1267 | } | 1267 | } |
1268 | status = ocfs2_journal_access(handle, new_inode, newfe_bh, | 1268 | status = ocfs2_journal_access_di(handle, new_inode, newfe_bh, |
1269 | OCFS2_JOURNAL_ACCESS_WRITE); | 1269 | OCFS2_JOURNAL_ACCESS_WRITE); |
1270 | if (status < 0) { | 1270 | if (status < 0) { |
1271 | mlog_errno(status); | 1271 | mlog_errno(status); |
1272 | goto bail; | 1272 | goto bail; |
@@ -1312,8 +1312,8 @@ static int ocfs2_rename(struct inode *old_dir, | |||
1312 | old_inode->i_ctime = CURRENT_TIME; | 1312 | old_inode->i_ctime = CURRENT_TIME; |
1313 | mark_inode_dirty(old_inode); | 1313 | mark_inode_dirty(old_inode); |
1314 | 1314 | ||
1315 | status = ocfs2_journal_access(handle, old_inode, old_inode_bh, | 1315 | status = ocfs2_journal_access_di(handle, old_inode, old_inode_bh, |
1316 | OCFS2_JOURNAL_ACCESS_WRITE); | 1316 | OCFS2_JOURNAL_ACCESS_WRITE); |
1317 | if (status >= 0) { | 1317 | if (status >= 0) { |
1318 | old_di = (struct ocfs2_dinode *) old_inode_bh->b_data; | 1318 | old_di = (struct ocfs2_dinode *) old_inode_bh->b_data; |
1319 | 1319 | ||
@@ -1389,9 +1389,9 @@ static int ocfs2_rename(struct inode *old_dir, | |||
1389 | (int)old_dir_nlink, old_dir->i_nlink); | 1389 | (int)old_dir_nlink, old_dir->i_nlink); |
1390 | } else { | 1390 | } else { |
1391 | struct ocfs2_dinode *fe; | 1391 | struct ocfs2_dinode *fe; |
1392 | status = ocfs2_journal_access(handle, old_dir, | 1392 | status = ocfs2_journal_access_di(handle, old_dir, |
1393 | old_dir_bh, | 1393 | old_dir_bh, |
1394 | OCFS2_JOURNAL_ACCESS_WRITE); | 1394 | OCFS2_JOURNAL_ACCESS_WRITE); |
1395 | fe = (struct ocfs2_dinode *) old_dir_bh->b_data; | 1395 | fe = (struct ocfs2_dinode *) old_dir_bh->b_data; |
1396 | fe->i_links_count = cpu_to_le16(old_dir->i_nlink); | 1396 | fe->i_links_count = cpu_to_le16(old_dir->i_nlink); |
1397 | status = ocfs2_journal_dirty(handle, old_dir_bh); | 1397 | status = ocfs2_journal_dirty(handle, old_dir_bh); |
@@ -1898,8 +1898,8 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, | |||
1898 | goto leave; | 1898 | goto leave; |
1899 | } | 1899 | } |
1900 | 1900 | ||
1901 | status = ocfs2_journal_access(handle, orphan_dir_inode, orphan_dir_bh, | 1901 | status = ocfs2_journal_access_di(handle, orphan_dir_inode, orphan_dir_bh, |
1902 | OCFS2_JOURNAL_ACCESS_WRITE); | 1902 | OCFS2_JOURNAL_ACCESS_WRITE); |
1903 | if (status < 0) { | 1903 | if (status < 0) { |
1904 | mlog_errno(status); | 1904 | mlog_errno(status); |
1905 | goto leave; | 1905 | goto leave; |
@@ -1986,8 +1986,8 @@ int ocfs2_orphan_del(struct ocfs2_super *osb, | |||
1986 | goto leave; | 1986 | goto leave; |
1987 | } | 1987 | } |
1988 | 1988 | ||
1989 | status = ocfs2_journal_access(handle,orphan_dir_inode, orphan_dir_bh, | 1989 | status = ocfs2_journal_access_di(handle,orphan_dir_inode, orphan_dir_bh, |
1990 | OCFS2_JOURNAL_ACCESS_WRITE); | 1990 | OCFS2_JOURNAL_ACCESS_WRITE); |
1991 | if (status < 0) { | 1991 | if (status < 0) { |
1992 | mlog_errno(status); | 1992 | mlog_errno(status); |
1993 | goto leave; | 1993 | goto leave; |