From 62a0ddc7919f5d7342f6d63cb5524ec5ba2fb88e Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Mon, 1 Nov 2004 12:30:44 +0000
Subject: [PATCH] b=4180 r=adilger
- deadlock fixed: in order to avoid handle restart holding i_zombie we
truncate file first in separate transaction
---
lustre/obdfilter/filter.c | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index ab194ce2dc..3e5d9f6a2b 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -2507,6 +2507,7 @@ static int filter_destroy(struct obd_export *exp, struct obdo *oa,
struct llog_cookie *fcc = NULL;
int rc, rc2, cleanup_phase = 0, have_prepared = 0;
void *lock = NULL;
+ struct iattr iattr;
ENTRY;
LASSERT(oa->o_valid & OBD_MD_FLGROUP);
@@ -2554,12 +2555,6 @@ static int filter_destroy(struct obd_export *exp, struct obdo *oa,
goto acquire_locks;
}
- handle = fsfilt_start_log(obd, dparent->d_inode,FSFILT_OP_UNLINK,oti,1);
- if (IS_ERR(handle))
- GOTO(cleanup, rc = PTR_ERR(handle));
-
- cleanup_phase = 3;
-
/* Our MDC connection is established by the MDS to us */
if (oa->o_valid & OBD_MD_FLCOOKIE) {
OBD_ALLOC(fcc, sizeof(*fcc));
@@ -2567,6 +2562,38 @@ static int filter_destroy(struct obd_export *exp, struct obdo *oa,
memcpy(fcc, obdo_logcookie(oa), sizeof(*fcc));
}
+ /* we're gonna truncate it first in order to avoid possible
+ * deadlock:
+ * P1 P2
+ * open trasaction open transaction
+ * down(i_zombie) down(i_zombie)
+ * restart transaction
+ * (see BUG 4180) -bzzz
+ */
+ down(&dchild->d_inode->i_sem);
+ handle = fsfilt_start_log(obd, dparent->d_inode,FSFILT_OP_SETATTR,NULL,1);
+ if (IS_ERR(handle)) {
+ up(&dchild->d_inode->i_sem);
+ GOTO(cleanup, rc = PTR_ERR(handle));
+ }
+
+ iattr.ia_valid = ATTR_SIZE;
+ iattr.ia_size = 0;
+ rc = fsfilt_setattr(obd, dchild, handle, &iattr, 1);
+
+ rc2 = fsfilt_commit(obd, filter->fo_sb, dparent->d_inode, handle, 0);
+ up(&dchild->d_inode->i_sem);
+ if (rc)
+ GOTO(cleanup, rc);
+ if (rc2)
+ GOTO(cleanup, rc = rc2);
+
+ handle = fsfilt_start_log(obd, dparent->d_inode,FSFILT_OP_UNLINK,oti,1);
+ if (IS_ERR(handle))
+ GOTO(cleanup, rc = PTR_ERR(handle));
+
+ cleanup_phase = 3;
+
rc = filter_destroy_internal(obd, oa->o_id, dparent, dchild);
cleanup:
--
GitLab