Whamcloud - gitweb
LU-14648 lod: protect lod_object layout info 71/43671/3
authorBobi Jam <bobijam@whamcloud.com>
Wed, 12 May 2021 08:18:00 +0000 (16:18 +0800)
committerOleg Drokin <green@whamcloud.com>
Thu, 8 Jul 2021 02:05:59 +0000 (02:05 +0000)
Need to protect lod_object's layout access with ldo_layout_mutex.

Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: I2c4a2078bdce64d15485d3ff18f6670d42ca90ba
Reviewed-on: https://review.whamcloud.com/43671
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/lod/lod_internal.h

index 53664b9..2d7875c 100644 (file)
@@ -484,23 +484,29 @@ static inline bool lod_obj_is_striped(struct dt_object *dt)
 {
        struct lod_object *lo = lod_dt_obj(dt);
        int i;
+       bool rc = false;
 
        if (!dt_object_exists(dt_object_child(dt)))
                return false;
 
-       if (S_ISDIR(dt->do_lu.lo_header->loh_attr))
-               return lo->ldo_dir_stripe_count != 0;
-
-       if (lo->ldo_is_foreign)
-               return false;
-
-       for (i = 0; i < lo->ldo_comp_cnt; i++) {
-               if (lo->ldo_comp_entries[i].llc_stripe == NULL)
-                       continue;
-               LASSERT(lo->ldo_comp_entries[i].llc_stripe_count > 0);
-               return true;
+       mutex_lock(&lo->ldo_layout_mutex);
+
+       if (S_ISDIR(dt->do_lu.lo_header->loh_attr)) {
+               rc = lo->ldo_dir_stripe_count != 0;
+       } else if (lo->ldo_is_foreign) {
+               rc = false;
+       } else {
+               for (i = 0; i < lo->ldo_comp_cnt; i++) {
+                       if (lo->ldo_comp_entries[i].llc_stripe == NULL)
+                               continue;
+                       LASSERT(lo->ldo_comp_entries[i].llc_stripe_count > 0);
+                       rc = true;
+                       break;
+               }
        }
-       return false;
+
+       mutex_unlock(&lo->ldo_layout_mutex);
+       return rc;
 }
 
 extern struct lu_context_key lod_thread_key;