Whamcloud - gitweb
LU-7263 mdt: put mnew in mdt_reint_rename_internal() 51/16751/3
authorJohn L. Hammond <john.hammond@intel.com>
Wed, 7 Oct 2015 18:11:52 +0000 (13:11 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 28 Oct 2015 13:48:44 +0000 (13:48 +0000)
In mdt_reint_rename_internal() if the mnew object is remote then put
it before returning.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I7a380f2d54d6546a9009c062ead7c77b8c8a88ee
Reviewed-on: http://review.whamcloud.com/16751
Tested-by: Jenkins
Reviewed-by: wangdi <di.wang@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/mdt/mdt_reint.c

index 7b4af4a..430900f 100644 (file)
@@ -1851,7 +1851,7 @@ static int mdt_reint_rename_internal(struct mdt_thread_info *info,
                        LASSERT(repbody != NULL);
                        repbody->mbo_fid1 = *new_fid;
                        repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS);
-                       GOTO(out_put_old, rc = -EXDEV);
+                       GOTO(out_put_new, rc = -EXDEV);
                }
                /* Before locking the target dir, check we do not replace
                 * a dir with a non-dir, otherwise it may deadlock with