projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wrappers for ->i_mutex access
[deliverable/linux.git]
/
fs
/
ocfs2
/
move_extents.c
diff --git
a/fs/ocfs2/move_extents.c
b/fs/ocfs2/move_extents.c
index 124471d26a73f4fe79738e2b89662d82a7ad0561..e3d05d9901a3da26b123865545446f5ef96b08a5 100644
(file)
--- a/
fs/ocfs2/move_extents.c
+++ b/
fs/ocfs2/move_extents.c
@@
-276,7
+276,7
@@
static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,
* context->data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
*/
* context->data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
*/
-
mutex_lock(&tl_inode->i_mutex
);
+
inode_lock(tl_inode
);
if (ocfs2_truncate_log_needs_flush(osb)) {
ret = __ocfs2_flush_truncate_log(osb);
if (ocfs2_truncate_log_needs_flush(osb)) {
ret = __ocfs2_flush_truncate_log(osb);
@@
-338,7
+338,7
@@
out_commit:
ocfs2_commit_trans(osb, handle);
out_unlock_mutex:
ocfs2_commit_trans(osb, handle);
out_unlock_mutex:
-
mutex_unlock(&tl_inode->i_mutex
);
+
inode_unlock(tl_inode
);
if (context->data_ac) {
ocfs2_free_alloc_context(context->data_ac);
if (context->data_ac) {
ocfs2_free_alloc_context(context->data_ac);
@@
-632,7
+632,7
@@
static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,
goto out;
}
goto out;
}
-
mutex_lock(&gb_inode->i_mutex
);
+
inode_lock(gb_inode
);
ret = ocfs2_inode_lock(gb_inode, &gb_bh, 1);
if (ret) {
ret = ocfs2_inode_lock(gb_inode, &gb_bh, 1);
if (ret) {
@@
-640,7
+640,7
@@
static int ocfs2_move_extent(struct ocfs2_move_extents_context *context,
goto out_unlock_gb_mutex;
}
goto out_unlock_gb_mutex;
}
-
mutex_lock(&tl_inode->i_mutex
);
+
inode_lock(tl_inode
);
handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) {
handle = ocfs2_start_trans(osb, credits);
if (IS_ERR(handle)) {
@@
-708,11
+708,11
@@
out_commit:
brelse(gd_bh);
out_unlock_tl_inode:
brelse(gd_bh);
out_unlock_tl_inode:
-
mutex_unlock(&tl_inode->i_mutex
);
+
inode_unlock(tl_inode
);
ocfs2_inode_unlock(gb_inode, 1);
out_unlock_gb_mutex:
ocfs2_inode_unlock(gb_inode, 1);
out_unlock_gb_mutex:
-
mutex_unlock(&gb_inode->i_mutex
);
+
inode_unlock(gb_inode
);
brelse(gb_bh);
iput(gb_inode);
brelse(gb_bh);
iput(gb_inode);
@@
-905,7
+905,7
@@
static int ocfs2_move_extents(struct ocfs2_move_extents_context *context)
if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
return -EROFS;
if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
return -EROFS;
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
/*
* This prevents concurrent writes from other nodes
/*
* This prevents concurrent writes from other nodes
@@
-969,7
+969,7
@@
out_inode_unlock:
out_rw_unlock:
ocfs2_rw_unlock(inode, 1);
out:
out_rw_unlock:
ocfs2_rw_unlock(inode, 1);
out:
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
return status;
}
return status;
}
This page took
0.025159 seconds
and
5
git commands to generate.