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

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

ocfs2: use 'osb' instead of 'OCFS2_SB()' 

We could use 'osb' instead of 'OCFS2_SB()' to make code more elegant.

Link: http://lkml.kernel.org/r/5A702111.7090907@huawei.com


Signed-off-by: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarYiwen Jiang <jiangyiwen@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 6870c016

fs/ocfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock, 
	down_write(&oi->ip_alloc_sem);



	if (first_get_block) {

		if (ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)))

		if (ocfs2_sparse_alloc(osb))

			ret = ocfs2_zero_tail(inode, di_bh, pos);

		else

			ret = ocfs2_expand_nonsparse_inode(inode, di_bh, pos,

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -3072,7 +3072,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
			 * We need to return the correct block within the

			 * cluster which should hold our entry.

			 */

			off = ocfs2_dx_dir_hash_idx(OCFS2_SB(dir->i_sb),

			off = ocfs2_dx_dir_hash_idx(osb,

						    &lookup->dl_hinfo);

			get_bh(dx_leaves[off]);

			lookup->dl_dx_leaf_bh = dx_leaves[off];

fs/ocfs2/dlmglue.c

+8 −13
Original line number Diff line number Diff line
@@ -1756,8 +1756,7 @@ int ocfs2_rw_lock(struct inode *inode, int write) 


	level = write ? DLM_LOCK_EX : DLM_LOCK_PR;



	status = ocfs2_cluster_lock(OCFS2_SB(inode->i_sb), lockres, level, 0,

				    0);

	status = ocfs2_cluster_lock(osb, lockres, level, 0, 0);

	if (status < 0)

		mlog_errno(status);
@@ -1796,7 +1795,7 @@ void ocfs2_rw_unlock(struct inode *inode, int write) 
	     write ? "EXMODE" : "PRMODE");



	if (!ocfs2_mount_local(osb))

		ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);

		ocfs2_cluster_unlock(osb, lockres, level);

}



/*
@@ -1816,8 +1815,7 @@ int ocfs2_open_lock(struct inode *inode) 


	lockres = &OCFS2_I(inode)->ip_open_lockres;



	status = ocfs2_cluster_lock(OCFS2_SB(inode->i_sb), lockres,

				    DLM_LOCK_PR, 0, 0);

	status = ocfs2_cluster_lock(osb, lockres, DLM_LOCK_PR, 0, 0);

	if (status < 0)

		mlog_errno(status);
@@ -1854,8 +1852,7 @@ int ocfs2_try_open_lock(struct inode *inode, int write) 
	 * other nodes and the -EAGAIN will indicate to the caller that

	 * this inode is still in use.

	 */

	status = ocfs2_cluster_lock(OCFS2_SB(inode->i_sb), lockres,

				    level, DLM_LKF_NOQUEUE, 0);

	status = ocfs2_cluster_lock(osb, lockres, level, DLM_LKF_NOQUEUE, 0);



out:

	return status;
@@ -1876,11 +1873,9 @@ void ocfs2_open_unlock(struct inode *inode) 
		goto out;



	if(lockres->l_ro_holders)

		ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres,

				     DLM_LOCK_PR);

		ocfs2_cluster_unlock(osb, lockres, DLM_LOCK_PR);

	if(lockres->l_ex_holders)

		ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres,

				     DLM_LOCK_EX);

		ocfs2_cluster_unlock(osb, lockres, DLM_LOCK_EX);



out:

	return;
@@ -2601,9 +2596,9 @@ void ocfs2_inode_unlock(struct inode *inode, 
	     (unsigned long long)OCFS2_I(inode)->ip_blkno,

	     ex ? "EXMODE" : "PRMODE");



	if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb)) &&

	if (!ocfs2_is_hard_readonly(osb) &&

	    !ocfs2_mount_local(osb))

		ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);

		ocfs2_cluster_unlock(osb, lockres, level);

}



/*

fs/ocfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int ocfs2_update_inode_atime(struct inode *inode, 
	ocfs2_journal_dirty(handle, bh);



out_commit:

	ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);

	ocfs2_commit_trans(osb, handle);

out:

	return ret;

}

fs/ocfs2/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ static void ocfs2_clear_inode(struct inode *inode) 
	trace_ocfs2_clear_inode((unsigned long long)oi->ip_blkno,

				inode->i_nlink);



	mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL,

	mlog_bug_on_msg(osb == NULL,

			"Inode=%lu\n", inode->i_ino);



	dquot_drop(inode);
@@ -1150,7 +1150,7 @@ static void ocfs2_clear_inode(struct inode *inode) 
	ocfs2_mark_lockres_freeing(osb, &oi->ip_inode_lockres);

	ocfs2_mark_lockres_freeing(osb, &oi->ip_open_lockres);



	ocfs2_resv_discard(&OCFS2_SB(inode->i_sb)->osb_la_resmap,

	ocfs2_resv_discard(&osb->osb_la_resmap,

			   &oi->ip_la_data_resv);

	ocfs2_resv_init_once(&oi->ip_la_data_resv);
@@ -1223,7 +1223,7 @@ static void ocfs2_clear_inode(struct inode *inode) 
	 * the journal is flushed before journal shutdown. Thus it is safe to

	 * have inodes get cleaned up after journal shutdown.

	 */

	jbd2_journal_release_jbd_inode(OCFS2_SB(inode->i_sb)->journal->j_journal,

	jbd2_journal_release_jbd_inode(osb->journal->j_journal,

				       &oi->ip_jinode);

}