ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
piaojun
2018-04-05 16:18:37 -07:00
committed by Linus Torvalds
parent 1119d3c06f
commit d324cd4c80
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ocfs2/alloc.c
View File

@@ -7119,7 +7119,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
goto out_commit; goto out_commit;
did_quota = 1; 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, ret = ocfs2_claim_clusters(handle, data_ac, 1, &bit_off,
&num); &num);

2
fs/ocfs2/aops.c
View File

@@ -346,7 +346,7 @@ static int ocfs2_readpage(struct file *file, struct page *page)
unlock = 0; unlock = 0;
out_alloc: out_alloc:
up_read(&OCFS2_I(inode)->ip_alloc_sem); up_read(&oi->ip_alloc_sem);
out_inode_unlock: out_inode_unlock:
ocfs2_inode_unlock(inode, 0); ocfs2_inode_unlock(inode, 0);
out: out:

6
fs/ocfs2/file.c
View File

@@ -101,7 +101,7 @@ static int ocfs2_file_open(struct inode *inode, struct file *file)
struct ocfs2_inode_info *oi = OCFS2_I(inode); struct ocfs2_inode_info *oi = OCFS2_I(inode);
trace_ocfs2_file_open(inode, file, file->f_path.dentry, 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.len,
file->f_path.dentry->d_name.name, mode); 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 /* 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 * node. If it hasn't then we're safe as long as we hold the
* spin lock until our increment of open count. */ * 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); spin_unlock(&oi->ip_lock);
status = -ENOENT; status = -ENOENT;
@@ -190,7 +190,7 @@ static int ocfs2_sync_file(struct file *file, loff_t start, loff_t end,
bool needs_barrier = false; bool needs_barrier = false;
trace_ocfs2_sync_file(inode, file, file->f_path.dentry, 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.len,
file->f_path.dentry->d_name.name, file->f_path.dentry->d_name.name,
(unsigned long long)datasync); (unsigned long long)datasync);

2
fs/ocfs2/inode.c
View File

@@ -1160,7 +1160,7 @@ static void ocfs2_clear_inode(struct inode *inode)
* exception here are successfully wiped inodes - their * exception here are successfully wiped inodes - their
* metadata can now be considered to be part of the system * metadata can now be considered to be part of the system
* inodes from which it came. */ * 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); ocfs2_checkpoint_inode(inode);
mlog_bug_on_msg(!list_empty(&oi->ip_io_markers), mlog_bug_on_msg(!list_empty(&oi->ip_io_markers),

6
fs/ocfs2/namei.c
View File

@@ -525,7 +525,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
* these are used by the support functions here and in * these are used by the support functions here and in
* callers. */ * callers. */
inode->i_ino = ino_from_blkno(osb->sb, fe_blkno); 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); spin_lock(&osb->osb_lock);
inode->i_generation = osb->s_next_generation++; inode->i_generation = osb->s_next_generation++;
spin_unlock(&osb->osb_lock); spin_unlock(&osb->osb_lock);
@@ -1186,8 +1186,8 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
} }
trace_ocfs2_double_lock_end( trace_ocfs2_double_lock_end(
(unsigned long long)OCFS2_I(inode1)->ip_blkno, (unsigned long long)oi1->ip_blkno,
(unsigned long long)OCFS2_I(inode2)->ip_blkno); (unsigned long long)oi2->ip_blkno);
bail: bail:
if (status) if (status)

6
fs/ocfs2/refcounttree.c
View File

@@ -573,7 +573,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode,
BUG_ON(ocfs2_is_refcount_inode(inode)); BUG_ON(ocfs2_is_refcount_inode(inode));
trace_ocfs2_create_refcount_tree( 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); ret = ocfs2_reserve_new_metadata_blocks(osb, 1, &meta_ac);
if (ret) { if (ret) {
@@ -4766,8 +4766,8 @@ static int ocfs2_reflink_inodes_lock(struct inode *s_inode,
*bh2 = *bh1; *bh2 = *bh1;
trace_ocfs2_double_lock_end( trace_ocfs2_double_lock_end(
(unsigned long long)OCFS2_I(inode1)->ip_blkno, (unsigned long long)oi1->ip_blkno,
(unsigned long long)OCFS2_I(inode2)->ip_blkno); (unsigned long long)oi2->ip_blkno);
return 0; return 0;