LU-3240 mdc: Check for all attributes validity in revalidate

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

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 65224af..1a71afb 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -1084,9 +1084,22 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
         } else {
                 fid_build_reg_res_name(fid, &res_id);
                 switch (it->it_op) {
-                case IT_GETATTR:
-                        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-                        break;
+               case IT_GETATTR:
+                       /* File attributes are held under multiple bits:
+                        * nlink is under lookup lock, size and times are
+                        * under UPDATE lock and recently we've also got
+                        * a separate permissions lock for owner/group/acl that
+                        * were protected by lookup lock before.
+                        * Getattr must provide all of that information,
+                        * so we need to ensure we have all of those locks.
+                        * Unfortunately, if the bits are split across multiple
+                        * locks, there's no easy way to match all of them here,
+                        * so an extra RPC would be performed to fetch all
+                        * of those bits at once for now. */
+                       policy.l_inodebits.bits = MDS_INODELOCK_UPDATE |
+                                                 MDS_INODELOCK_LOOKUP |
+                                                 MDS_INODELOCK_PERM;
+                       break;
                 case IT_LAYOUT:
                         policy.l_inodebits.bits = MDS_INODELOCK_LAYOUT;
                         break;
@@ -1094,6 +1107,7 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
                         policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP;
                         break;
                 }
+
                 mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
                                        LDLM_FL_BLOCK_GRANTED, &res_id,
                                        LDLM_IBITS, &policy,