diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-10-20 00:10:27 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-10-20 00:10:27 -0300 |
| commit | d0b2f91bede3bd5e3d24dd6803e56eee959c1797 (patch) | |
| tree | 7fee4ab0509879c373c4f2cbd5b8a5be5b4041ee /fs/aufs/cpup.c | |
| parent | e914f8eb445e8f74b00303c19c2ffceaedd16a05 (diff) | |
Linux-libre 4.8.2-gnupck-4.8.2-gnu
Diffstat (limited to 'fs/aufs/cpup.c')
| -rw-r--r-- | fs/aufs/cpup.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c index 484cdc3ee..598a4d6c3 100644 --- a/fs/aufs/cpup.c +++ b/fs/aufs/cpup.c @@ -381,6 +381,7 @@ static int au_cp_regular(struct au_cp_generic *cpg) } }; struct super_block *sb; + struct inode *h_src_inode; struct task_struct *tsk = current; /* bsrc branch can be ro/rw. */ @@ -396,7 +397,9 @@ static int au_cp_regular(struct au_cp_generic *cpg) } /* try stopping to update while we copyup */ - IMustLock(d_inode(file[SRC].dentry)); + h_src_inode = d_inode(file[SRC].dentry); + if (!au_test_nfs(h_src_inode->i_sb)) + IMustLock(h_src_inode); err = au_copy_file(file[DST].file, file[SRC].file, cpg->len); /* i wonder if we had O_NO_DELAY_FPUT flag */ @@ -456,8 +459,13 @@ static int au_do_cpup_regular(struct au_cp_generic *cpg, goto out; } h_src_attr->valid = 1; - err = au_cp_regular(cpg); - inode_unlock(h_src_inode); + if (!au_test_nfs(h_src_inode->i_sb)) { + err = au_cp_regular(cpg); + inode_unlock(h_src_inode); + } else { + inode_unlock(h_src_inode); + err = au_cp_regular(cpg); + } rerr = au_pin_hdir_relock(cpg->pin); if (!err && rerr) err = rerr; |