Branch HEAD

b=16561

roll back, (cannot finish sanitN.sh)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 3fda82b..78b092c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -22,12 +22,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 2d8eaa9..ce1169f 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -2495,10 +2495,8 @@ int ll_release_openhandle(struct dentry *dentry, struct lookup_intent *it)
                                        inode, 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);
 }