Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d324cd4c authored by piaojun's avatar piaojun Committed by Linus Torvalds
Browse files

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: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarYiwen Jiang <jiangyiwen@huawei.com>
Reviewed-by: default avatarAlex Chen <alex.chen@huawei.com>
Reviewed-by: default avatarAndrew 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1119d3c0

fs/ocfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

fs/ocfs2/file.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

fs/ocfs2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

fs/ocfs2/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -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)