Merge tag 'xfs-4.17-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / ocfs2 / refcounttree.c

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index ab156e3..01c6b38 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -573,7 +573,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode,
        BUG_ON(ocfs2_is_refcount_inode(inode));
 
        trace_ocfs2_create_refcount_tree(
-               (unsigned long long)OCFS2_I(inode)->ip_blkno);
+               (unsigned long long)oi->ip_blkno);
 
        ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
        if (ret) {
@@ -3359,7 +3359,7 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context *context)
        unsigned int ext_flags;
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
 
-       if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) {
+       if (!ocfs2_refcount_tree(osb)) {
                return ocfs2_error(inode->i_sb, "Inode %lu want to use refcount tree, but the feature bit is not set in the super block\n",
                                   inode->i_ino);
        }
@@ -3707,7 +3707,7 @@ int ocfs2_add_refcount_flag(struct inode *inode,
        trace_ocfs2_add_refcount_flag(ref_blocks, credits);
 
        if (ref_blocks) {
-               ret = ocfs2_reserve_new_metadata_blocks(OCFS2_SB(inode->i_sb),
+               ret = ocfs2_reserve_new_metadata_blocks(osb,
                                                        ref_blocks, &meta_ac);
                if (ret) {
                        mlog_errno(ret);
@@ -4766,8 +4766,8 @@ static int ocfs2_reflink_inodes_lock(struct inode *s_inode,
                *bh2 = *bh1;
 
        trace_ocfs2_double_lock_end(
-                       (unsigned long long)OCFS2_I(inode1)->ip_blkno,
-                       (unsigned long long)OCFS2_I(inode2)->ip_blkno);
+                       (unsigned long long)oi1->ip_blkno,
+                       (unsigned long long)oi2->ip_blkno);
 
        return 0;