LU-6142 lov: Fix style issues for lov_merge.c

[fs/lustre-release.git] / lustre / lov / lov_merge.c

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index 2169042..a4cf451 100644 (file)
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,9 +42,10 @@
  * initializes the current atime, mtime, ctime to avoid regressing a more
  * uptodate time on the local client.
  */
-int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
-                      struct ost_lvb *lvb, __u64 *kms_place)
+int lov_merge_lvb_kms(struct lov_stripe_md *lsm, int index,
+                     struct ost_lvb *lvb, __u64 *kms_place)
 {
+       struct lov_stripe_md_entry *lse = lsm->lsm_entries[index];
        u64 size = 0;
        u64 kms = 0;
        u64 blocks = 0;
@@ -55,54 +56,54 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
        int rc = 0;
 
        assert_spin_locked(&lsm->lsm_lock);
-       LASSERT(lsm->lsm_lock_owner == current_pid());
+       LASSERT(lsm->lsm_lock_owner == current->pid);
 
        CDEBUG(D_INODE, "MDT ID "DOSTID" initial value: s=%llu m=%llu"
               " a=%llu c=%llu b=%llu\n", POSTID(&lsm->lsm_oi),
               lvb->lvb_size, lvb->lvb_mtime, lvb->lvb_atime, lvb->lvb_ctime,
               lvb->lvb_blocks);
-       for (i = 0; i < lsm->lsm_stripe_count; i++) {
-               struct lov_oinfo *loi = lsm->lsm_oinfo[i];
+       for (i = 0; i < lse->lsme_stripe_count; i++) {
+               struct lov_oinfo *loi = lse->lsme_oinfo[i];
                u64 lov_size;
                u64 tmpsize;
 
-                if (OST_LVB_IS_ERR(loi->loi_lvb.lvb_blocks)) {
-                        rc = OST_LVB_GET_ERR(loi->loi_lvb.lvb_blocks);
-                        continue;
-                }
+               if (OST_LVB_IS_ERR(loi->loi_lvb.lvb_blocks)) {
+                       rc = OST_LVB_GET_ERR(loi->loi_lvb.lvb_blocks);
+                       continue;
+               }
 
-                tmpsize = loi->loi_kms;
-                lov_size = lov_stripe_size(lsm, tmpsize, i);
-                if (lov_size > kms)
-                        kms = lov_size;
+               tmpsize = loi->loi_kms;
+               lov_size = lov_stripe_size(lsm, index, tmpsize, i);
+               if (lov_size > kms)
+                       kms = lov_size;
 
-                if (loi->loi_lvb.lvb_size > tmpsize)
-                        tmpsize = loi->loi_lvb.lvb_size;
+               if (loi->loi_lvb.lvb_size > tmpsize)
+                       tmpsize = loi->loi_lvb.lvb_size;
 
-                lov_size = lov_stripe_size(lsm, tmpsize, i);
-                if (lov_size > size)
-                        size = lov_size;
-                /* merge blocks, mtime, atime */
-                blocks += loi->loi_lvb.lvb_blocks;
-                if (loi->loi_lvb.lvb_mtime > current_mtime)
-                        current_mtime = loi->loi_lvb.lvb_mtime;
-                if (loi->loi_lvb.lvb_atime > current_atime)
-                        current_atime = loi->loi_lvb.lvb_atime;
-                if (loi->loi_lvb.lvb_ctime > current_ctime)
-                        current_ctime = loi->loi_lvb.lvb_ctime;
+               lov_size = lov_stripe_size(lsm, index, tmpsize, i);
+               if (lov_size > size)
+                       size = lov_size;
+               /* merge blocks, mtime, atime */
+               blocks += loi->loi_lvb.lvb_blocks;
+               if (loi->loi_lvb.lvb_mtime > current_mtime)
+                       current_mtime = loi->loi_lvb.lvb_mtime;
+               if (loi->loi_lvb.lvb_atime > current_atime)
+                       current_atime = loi->loi_lvb.lvb_atime;
+               if (loi->loi_lvb.lvb_ctime > current_ctime)
+                       current_ctime = loi->loi_lvb.lvb_ctime;
 
                CDEBUG(D_INODE, "MDT ID "DOSTID" on OST[%u]: s=%llu m=%llu"
                       " a=%llu c=%llu b=%llu\n", POSTID(&lsm->lsm_oi),
                       loi->loi_ost_idx, loi->loi_lvb.lvb_size,
                       loi->loi_lvb.lvb_mtime, loi->loi_lvb.lvb_atime,
                       loi->loi_lvb.lvb_ctime, loi->loi_lvb.lvb_blocks);
-        }
+       }
 
-        *kms_place = kms;
-        lvb->lvb_size = size;
-        lvb->lvb_blocks = blocks;
-        lvb->lvb_mtime = current_mtime;
-        lvb->lvb_atime = current_atime;
-        lvb->lvb_ctime = current_ctime;
-        RETURN(rc);
+       *kms_place = kms;
+       lvb->lvb_size = size;
+       lvb->lvb_blocks = blocks;
+       lvb->lvb_mtime = current_mtime;
+       lvb->lvb_atime = current_atime;
+       lvb->lvb_ctime = current_ctime;
+       RETURN(rc);
 }