LU-8041 mdd: increasing only atime update on close

[fs/lustre-release.git] / lustre / mdc / mdc_lib.c

diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index 6f79627..62e1cf9 100644 (file)
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -486,13 +486,25 @@ void mdc_getattr_pack(struct ptlrpc_request *req, __u64 valid, __u32 flags,
 
 void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data)
 {
-        struct mdt_ioepoch *epoch;
-        struct mdt_rec_setattr *rec;
+       struct mdt_ioepoch *epoch;
+       struct mdt_rec_setattr *rec;
 
-        epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
-        rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
+       epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
+       rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
 
-        mdc_setattr_pack_rec(rec, op_data);
-        mdc_ioepoch_pack(epoch, op_data);
+       mdc_setattr_pack_rec(rec, op_data);
+       /*
+        * The client will zero out local timestamps when losing the IBITS lock
+        * so any new RPC timestamps will update the client inode's timestamps.
+        * There was a defect on the server side which allowed the atime to be
+        * overwritten by a zeroed-out atime packed into the close RPC.
+        *
+        * Proactively clear the MDS_ATTR_ATIME flag in the RPC in this case
+        * to avoid zeroing the atime on old unpatched servers.  See LU-8041.
+        */
+       if (rec->sa_atime == 0)
+               rec->sa_valid &= ~MDS_ATTR_ATIME;
+
+       mdc_ioepoch_pack(epoch, op_data);
        mdc_intent_close_pack(req, op_data);
 }