b=21489 disable sending mtime back to the client on bulk write

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index afacd5f..cd693d6 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -7,6 +7,16 @@ Description: bad entry in directory xxx: inode out of bounds
 Details    : fix locking issue in the rename path which could race with any
             other operations updating the same directory.
 
+Severity   : normal
+Bugzilla   : 20247
+Description: Dropping PUT error on first mount
+Details    : don't print neterror to the console since it is too chatty and
+            can flood the console when a node is down.
+
+Severity   : normal
+Bugzilla   : 21489
+Description: cp -p command does not preserve the dates and timestamp
+
 2009-10-16 Sun Microsystems, Inc.
        * version 1.8.1.1
        * Support for kernels:

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 737fdd9..d24376e 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -1059,6 +1059,13 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
         rc = obd_commitrw(OBD_BRW_WRITE, exp, &repbody->oa, objcount, ioo,
                           remote_nb, npages, local_nb, oti, rc);
 
+        /*
+         * Disable sending mtime back to the client. If the client locked the
+         * whole object, then it has already updated the mtime on its side,
+         * otherwise it will have to glimpse anyway (see bug 21489, comment 32)
+         */
+        repbody->oa.o_valid &= ~(OBD_MD_FLMTIME | OBD_MD_FLATIME);
+
         if (unlikely(client_cksum != server_cksum && rc == 0)) {
                 int  new_cksum = ost_checksum_bulk(desc, OST_WRITE, cksum_type);
                 char *msg;