From 927d603fe672792bf05552724669d38a2e6e2726 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 26 Jul 2004 10:59:34 +0000 Subject: [PATCH] - mds_reint_unlink() shouldn't kill slaves if master directory can't be unlinked --- lustre/mds/mds_reint.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index d2e5661..836fa10 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -1838,7 +1838,10 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset, mds_open_unlink_rename(rec, obd, dparent, dchild, NULL); } /* handle splitted dir */ - mds_unlink_slave_objs(obd, dchild); + if (rc == 0) { + /* master directory can be non-empty or something else ... */ + mds_unlink_slave_objs(obd, dchild); + } rc = mds_finish_transno(mds, dparent->d_inode, handle, req, rc, 0); if (!rc) -- 1.8.3.1