Branch b1_8

 b=20302
 i=andrew.perepechko
 i=adilger
----------------------------------------------------------------------
 Modified Files:
  Tag: b1_8
 	lustre/ChangeLog lustre/mds/handler.c lustre/ptlrpc/client.c
----------------------------------------------------------------------
Description: mds_getattr() should return 0, even if mds_fid2entry() fails with
-ENOENT. Also fix in ptlrpc_expire_one_request() to print signed
time difference.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a1ce3c4..c625e63 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -10,6 +10,12 @@ tbd Sun Microsystems, Inc.
          2.6.16 - 2.6.30 vanilla (kernel.org)
        * Recommended e2fsprogs version: 1.41.6.sun1
 
+Severity   : normal
+Bugzilla   : 20302
+Description: mds_getattr() should return 0, even if mds_fid2entry() fails with
+            -ENOENT. Also fix in ptlrpc_expire_one_request() to print signed
+            time difference.
+
 Severity   : enhancement
 Bugzilla   : 19662
 Description: Remove set_info(KEY_UNLINKED) from MDS/OSC

diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index c85210f..9fde0f3 100644 (file)
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -1080,7 +1080,7 @@ static int mds_getattr(struct ptlrpc_request *req, int offset)
         push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
         de = mds_fid2dentry(mds, &body->fid1, NULL);
         if (IS_ERR(de)) {
-                rc = req->rq_status = PTR_ERR(de);
+                req->rq_status = PTR_ERR(de);
                 GOTO(out_pop, rc);
         }
 
@@ -1101,7 +1101,8 @@ out_ucred:
                 int rc2 = lustre_pack_reply(req, 1, NULL, NULL);
                 if (rc == 0)
                         rc = rc2;
-                req->rq_status = rc;
+                if (rc != 0)
+                        req->rq_status = rc;
         }
         mds_exit_ucred(&uc, mds);
 

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 1fdb72a..3587573 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1428,7 +1428,7 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink)
         ENTRY;
 
         DEBUG_REQ(D_WARNING, req, "Request x"LPU64" sent from %s to NID %s"
-                  " %lus ago has %s (limit %lus).\n", req->rq_xid,
+                  " %lus ago has %s (%lds prior to deadline).\n", req->rq_xid,
                   imp ? imp->imp_obd->obd_name : "<?>",
                   imp ? libcfs_nid2str(imp->imp_connection->c_peer.nid) : "<?>",
                   cfs_time_current_sec() - req->rq_sent,