X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Foverlayfs%2Fcopy_up.c;h=c441f9387a1ba0f2ddf1f1426a114a5533fb6e30;hb=b4eebd88c2234a644132568eeaf7691d5b07c01a;hp=aad97b30d5e657199f741f02700208c41e5424ae;hpb=27efed3e8384e4d87fe3c07e7a046c1f43eb0993;p=linux-2.6-microblaze.git

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index aad97b30d5e6..c441f9387a1b 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -561,10 +561,8 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)
 		c->tmpfile = true;
 		err = ovl_copy_up_locked(c);
 	} else {
-		err = -EIO;
-		if (lock_rename(c->workdir, c->destdir) != NULL) {
-			pr_err("overlayfs: failed to lock workdir+upperdir\n");
-		} else {
+		err = ovl_lock_rename_workdir(c->workdir, c->destdir);
+		if (!err) {
 			err = ovl_copy_up_locked(c);
 			unlock_rename(c->workdir, c->destdir);
 		}