ocfs2: use 'oi' instead of 'OCFS2_I()'

We could use 'oi' instead of 'OCFS2_I()' to make code more elegant.

Link: http://lkml.kernel.org/r/5A7020FE.5050906@huawei.com
Signed-off-by: Jun Piao <piaojun@huawei.com>
Reviewed-by: Yiwen Jiang <jiangyiwen@huawei.com>
Reviewed-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Changwei Ge <ge.changwei@h3c.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 9a876bb07cac7f769a80f39ee9987e34f718d45e..0f157bbd3e0f226589d2e4bd4ce6e7095a0a5cb1 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -7119,7 +7119,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
                        goto out_commit;
                did_quota = 1;
 
-               data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
+               data_ac->ac_resv = &oi->ip_la_data_resv;
 
                ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off,
                                           &num);

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 5ff960b7f078955fa7d05bccd0f7989c860e7ab0..302cd7caa4a7ff756479e8b79ae2f4c7d33e0628 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -346,7 +346,7 @@ static int ocfs2_readpage(struct file *file, struct page *page)
        unlock = 0;
 
 out_alloc:
-       up_read(&OCFS2_I(inode)->ip_alloc_sem);
+       up_read(&oi->ip_alloc_sem);
 out_inode_unlock:
        ocfs2_inode_unlock(inode, 0);
 out:

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9d8c3ee05c39be6f749e3e77ba08f82c19053cb9..164fd0940af4a872a34d68478c464517057ccd76 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -101,7 +101,7 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
        struct ocfs2_inode_info *oi = OCFS2_I(inode);
 
        trace_ocfs2_file_open(inode, file, file->f_path.dentry,
-                             (unsigned long long)OCFS2_I(inode)->ip_blkno,
+                             (unsigned long long)oi->ip_blkno,
                              file->f_path.dentry->d_name.len,
                              file->f_path.dentry->d_name.name, mode);
 
@@ -116,7 +116,7 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
        /* Check that the inode hasn't been wiped from disk by another
         * node. If it hasn't then we're safe as long as we hold the
         * spin lock until our increment of open count. */
-       if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_DELETED) {
+       if (oi->ip_flags & OCFS2_INODE_DELETED) {
                spin_unlock(&oi->ip_lock);
 
                status = -ENOENT;
@@ -190,7 +190,7 @@ static int ocfs2_sync_file(struct file *file, loff_t start, loff_t end,
        bool needs_barrier = false;
 
        trace_ocfs2_sync_file(inode, file, file->f_path.dentry,
-                             OCFS2_I(inode)->ip_blkno,
+                             oi->ip_blkno,
                              file->f_path.dentry->d_name.len,
                              file->f_path.dentry->d_name.name,
                              (unsigned long long)datasync);

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 152f65b9c60ecf5f3d7110efc6225e3d79e0ac6c..ddc3e9470c87df0573e8f1fd6c59e1ae652b616d 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1160,7 +1160,7 @@ static void ocfs2_clear_inode(struct inode *inode)
         * exception here are successfully wiped inodes - their
         * metadata can now be considered to be part of the system
         * inodes from which it came. */
-       if (!(OCFS2_I(inode)->ip_flags & OCFS2_INODE_DELETED))
+       if (!(oi->ip_flags & OCFS2_INODE_DELETED))
                ocfs2_checkpoint_inode(inode);
 
        mlog_bug_on_msg(!list_empty(&oi->ip_io_markers),

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index c801eddc4bf35ad0d796f8ebf2cf0be4f62ea607..8dd6f703c819dd8919392db325740a3c4ac42c88 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -525,7 +525,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
         * these are used by the support functions here and in
         * callers. */
        inode->i_ino = ino_from_blkno(osb->sb, fe_blkno);
-       OCFS2_I(inode)->ip_blkno = fe_blkno;
+       oi->ip_blkno = fe_blkno;
        spin_lock(&osb->osb_lock);
        inode->i_generation = osb->s_next_generation++;
        spin_unlock(&osb->osb_lock);
@@ -1186,8 +1186,8 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
        }
 
        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);
 
 bail:
        if (status)

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 323b162fb401b85641d5c506a49d8818f0db040c..01c6b3894406e0b9c51ede0086ca7633dd1f5044 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) {
@@ -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;