From 88726660acc170e0dd8e7f98b70302da6083ff91 Mon Sep 17 00:00:00 2001
From: johann <johann>
Date: Tue, 7 Oct 2008 15:08:55 +0000
Subject: [PATCH] Branch b1_6 b=17026
Reverted inadvertent commit in mds_reint.c.
---
lustre/mds/mds_reint.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index ab8330d899..2dc03816b9 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -2393,8 +2393,7 @@ no_unlink:
GOTO(cleanup, rc);
cleanup:
- rc = mds_finish_transno(mds, de_tgtdir && !IS_ERR(de_tgtdir) ?
- de_tgtdir->d_inode : NULL,
+ rc = mds_finish_transno(mds, de_tgtdir ? de_tgtdir->d_inode : NULL,
handle, req, rc, 0, 0);
switch (cleanup_phase) {
--
GitLab