Don't remove directory inodes from locks prematurely. Causes pages not to

be evicted if lock is revoked.
b=2451
r=phik

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index f93070f..3513383 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -20,6 +20,7 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        - use kmalloc instead of slabs in portals (2430)
        - don't create duplicate records when a failover MDS is present (2442)
        - remove unnecessary mount age check (2332)
+       - don't remove directory inodes from locks prematurely (2451)
 
 2003-12-13  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.0.1

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index f5bacb5..1b67df2 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -289,6 +289,9 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
 
                         LASSERT(lsm->lsm_object_id != 0);
 
+                        /* bug 2334: drop MDS lock before acquiring OST lock */
+                        ll_intent_drop_lock(it);
+
                         rc = ll_extent_lock(NULL, inode, lsm, LCK_PR, &extent,
                                             &lockh);
                         if (rc != ELDLM_OK) {
@@ -348,9 +351,6 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
         if (rc < 0)
                 GOTO(out, retval = ERR_PTR(rc));
 
-        /* bug 2334: drop MDS lock before acquiring OST lock */
-        ll_intent_drop_lock(it);
-
         rc = lookup_it_finish(req, 1, it, &icbd);
         if (rc != 0) {
                 ll_intent_release(it);