From 5c23213c09646162f68c860f2593df78ed64e937 Mon Sep 17 00:00:00 2001 From: tappro Date: Thu, 20 Nov 2008 18:57:50 +0000 Subject: [PATCH] - fix issue with orphan handling, lost decrement of orphan count and test b:15392 i:adilger,shadow,umka --- lustre/mds/mds_reint.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index 73803d4..f54b6f5 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -1845,11 +1845,6 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset, cleanup_phase = 1; /* dchild, dparent, locks */ dget(dchild); - /* VBR: version recovery check for parent */ - rc = mds_version_get_check(req, dparent->d_inode, 0); - if (rc) - GOTO(cleanup_no_trans, rc); - child_inode = dchild->d_inode; if (child_inode == NULL) { CDEBUG(D_INODE, "child doesn't exist (dir %lu, name %s)\n", @@ -1865,6 +1860,11 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset, cleanup_phase = 2; /* dchild has a lock */ + /* VBR: version recovery check for parent */ + rc = mds_version_get_check(req, dparent->d_inode, 0); + if (rc) + GOTO(cleanup_no_trans, rc); + /* version recovery check */ rc = mds_version_get_check(req, child_inode, 1); if (rc) -- 1.8.3.1