From 756d4d22a0d7ae5127dfe8bfa17a6819b606cad0 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Thu, 4 Sep 2008 07:12:06 +0000
Subject: [PATCH] Branch b1_6 b=16561
roll back (cannot finish sanitN.sh)
---
lustre/ChangeLog | 6 ------
lustre/llite/file.c | 6 ++----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 28e142b9bf..d35af16e21 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -48,12 +48,6 @@ Description: service mount cannot take device name with ":"
Details : Only when device name contains ":/" will mount treat it as
client mount.
-Severity : major
-Bugzilla : 16561
-Description: Hitting mdc_commit_close() ASSERTION
-Details : Properly handle request reference release in
- ll_release_openhandle().
-
Severity : normal
Bugzilla : 15927
Frequency : rare
diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index c6567c896a..86d836c790 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2460,10 +2460,8 @@ int ll_release_openhandle(struct dentry *dentry, struct lookup_intent *it)
OBD_FREE(och, sizeof(*och));
out:
/* this one is in place of ll_file_open */
- if (it_disposition(it, DISP_ENQ_OPEN_REF)) {
- ptlrpc_req_finished(it->d.lustre.it_data);
- it_clear_disposition(it, DISP_ENQ_OPEN_REF);
- }
+ ptlrpc_req_finished(it->d.lustre.it_data);
+ it_clear_disposition(it, DISP_ENQ_OPEN_REF);
RETURN(rc);
}
--
GitLab