diff options
-rw-r--r-- | fs/ocfs2/xattr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index d2760e644751..17028aa7bc26 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c | |||
@@ -1894,8 +1894,8 @@ int ocfs2_xattr_remove(struct inode *inode, struct buffer_head *di_bh) | |||
1894 | mlog_errno(ret); | 1894 | mlog_errno(ret); |
1895 | goto out; | 1895 | goto out; |
1896 | } | 1896 | } |
1897 | ret = ocfs2_journal_access(handle, inode, di_bh, | 1897 | ret = ocfs2_journal_access_di(handle, inode, di_bh, |
1898 | OCFS2_JOURNAL_ACCESS_WRITE); | 1898 | OCFS2_JOURNAL_ACCESS_WRITE); |
1899 | if (ret) { | 1899 | if (ret) { |
1900 | mlog_errno(ret); | 1900 | mlog_errno(ret); |
1901 | goto out_commit; | 1901 | goto out_commit; |
@@ -2103,8 +2103,8 @@ static int ocfs2_xattr_block_set(struct inode *inode, | |||
2103 | int ret; | 2103 | int ret; |
2104 | 2104 | ||
2105 | if (!xs->xattr_bh) { | 2105 | if (!xs->xattr_bh) { |
2106 | ret = ocfs2_journal_access(handle, inode, xs->inode_bh, | 2106 | ret = ocfs2_journal_access_di(handle, inode, xs->inode_bh, |
2107 | OCFS2_JOURNAL_ACCESS_CREATE); | 2107 | OCFS2_JOURNAL_ACCESS_CREATE); |
2108 | if (ret < 0) { | 2108 | if (ret < 0) { |
2109 | mlog_errno(ret); | 2109 | mlog_errno(ret); |
2110 | goto end; | 2110 | goto end; |
@@ -2121,8 +2121,8 @@ static int ocfs2_xattr_block_set(struct inode *inode, | |||
2121 | new_bh = sb_getblk(inode->i_sb, first_blkno); | 2121 | new_bh = sb_getblk(inode->i_sb, first_blkno); |
2122 | ocfs2_set_new_buffer_uptodate(inode, new_bh); | 2122 | ocfs2_set_new_buffer_uptodate(inode, new_bh); |
2123 | 2123 | ||
2124 | ret = ocfs2_journal_access(handle, inode, new_bh, | 2124 | ret = ocfs2_journal_access_xb(handle, inode, new_bh, |
2125 | OCFS2_JOURNAL_ACCESS_CREATE); | 2125 | OCFS2_JOURNAL_ACCESS_CREATE); |
2126 | if (ret < 0) { | 2126 | if (ret < 0) { |
2127 | mlog_errno(ret); | 2127 | mlog_errno(ret); |
2128 | goto end; | 2128 | goto end; |
@@ -3377,8 +3377,8 @@ static int ocfs2_xattr_create_index_block(struct inode *inode, | |||
3377 | */ | 3377 | */ |
3378 | down_write(&oi->ip_alloc_sem); | 3378 | down_write(&oi->ip_alloc_sem); |
3379 | 3379 | ||
3380 | ret = ocfs2_journal_access(handle, inode, xb_bh, | 3380 | ret = ocfs2_journal_access_xb(handle, inode, xb_bh, |
3381 | OCFS2_JOURNAL_ACCESS_WRITE); | 3381 | OCFS2_JOURNAL_ACCESS_WRITE); |
3382 | if (ret) { | 3382 | if (ret) { |
3383 | mlog_errno(ret); | 3383 | mlog_errno(ret); |
3384 | goto out; | 3384 | goto out; |
@@ -4216,8 +4216,8 @@ static int ocfs2_add_new_xattr_cluster(struct inode *inode, | |||
4216 | 4216 | ||
4217 | ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh); | 4217 | ocfs2_init_xattr_tree_extent_tree(&et, inode, root_bh); |
4218 | 4218 | ||
4219 | ret = ocfs2_journal_access(handle, inode, root_bh, | 4219 | ret = ocfs2_journal_access_xb(handle, inode, root_bh, |
4220 | OCFS2_JOURNAL_ACCESS_WRITE); | 4220 | OCFS2_JOURNAL_ACCESS_WRITE); |
4221 | if (ret < 0) { | 4221 | if (ret < 0) { |
4222 | mlog_errno(ret); | 4222 | mlog_errno(ret); |
4223 | goto leave; | 4223 | goto leave; |
@@ -4808,8 +4808,8 @@ static int ocfs2_rm_xattr_cluster(struct inode *inode, | |||
4808 | goto out; | 4808 | goto out; |
4809 | } | 4809 | } |
4810 | 4810 | ||
4811 | ret = ocfs2_journal_access(handle, inode, root_bh, | 4811 | ret = ocfs2_journal_access_xb(handle, inode, root_bh, |
4812 | OCFS2_JOURNAL_ACCESS_WRITE); | 4812 | OCFS2_JOURNAL_ACCESS_WRITE); |
4813 | if (ret) { | 4813 | if (ret) { |
4814 | mlog_errno(ret); | 4814 | mlog_errno(ret); |
4815 | goto out_commit; | 4815 | goto out_commit; |