xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

Browse Source 
Conflicts:
	fs/ocfs2/ocfs2.h
This commit is contained in:
Joel Becker
2010-10-15 13:03:09 -07:00
parent 7bdb0d18bf d4396eafe4
commit fc3718918f
764 changed files with 8226 additions and 4131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ocfs2/refcounttree.c
View File

@@ -4240,8 +4240,9 @@ static int __ocfs2_reflink(struct dentry *old_dentry,
goto out;
}
mutex_lock(&new_inode->i_mutex);
ret = ocfs2_inode_lock(new_inode, &new_bh, 1);
mutex_lock_nested(&new_inode->i_mutex, I_MUTEX_CHILD);
ret = ocfs2_inode_lock_nested(new_inode, &new_bh, 1,
OI_LS_REFLINK_TARGET);
if (ret) {
mlog_errno(ret);
goto out_unlock;