X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_merge.c;h=fd7417990ed0e9c95fd0f2d55534653577eee6d9;hb=446eb3dda264c24acdeeea3158bba55a16c8c5e1;hp=b7911c92daff1af7bd78a054ba8a685c9fd3ad74;hpb=8e357d93ccc26e85e6ddf53360df72b47a254852;p=fs%2Flustre-release.git

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index b7911c9..fd74179 100644
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -62,7 +62,7 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
 	int i;
 	int rc = 0;
 
-	LASSERT(spin_is_locked(&lsm->lsm_lock));
+	assert_spin_locked(&lsm->lsm_lock);
 #ifdef __KERNEL__
 	LASSERT(lsm->lsm_lock_owner == current_pid());
 #endif
@@ -116,46 +116,6 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
         RETURN(rc);
 }
 
-/* Must be called under the lov_stripe_lock() */
-int lov_adjust_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
-                   obd_off size, int shrink)
-{
-        struct lov_oinfo *loi;
-        int stripe = 0;
-        __u64 kms;
-        ENTRY;
-
-	LASSERT(spin_is_locked(&lsm->lsm_lock));
-#ifdef __KERNEL__
-	LASSERT(lsm->lsm_lock_owner == current_pid());
-#endif
-
-        if (shrink) {
-                for (; stripe < lsm->lsm_stripe_count; stripe++) {
-                        struct lov_oinfo *loi = lsm->lsm_oinfo[stripe];
-                        kms = lov_size_to_stripe(lsm, size, stripe);
-                        CDEBUG(D_INODE,
-                               "stripe %d KMS %sing "LPU64"->"LPU64"\n",
-                               stripe, kms > loi->loi_kms ? "increas":"shrink",
-                               loi->loi_kms, kms);
-                        loi_kms_set(loi, loi->loi_lvb.lvb_size = kms);
-                }
-                RETURN(0);
-        }
-
-        if (size > 0)
-                stripe = lov_stripe_number(lsm, size - 1);
-        kms = lov_size_to_stripe(lsm, size, stripe);
-        loi = lsm->lsm_oinfo[stripe];
-
-        CDEBUG(D_INODE, "stripe %d KMS %sincreasing "LPU64"->"LPU64"\n",
-               stripe, kms > loi->loi_kms ? "" : "not ", loi->loi_kms, kms);
-        if (kms > loi->loi_kms)
-                loi_kms_set(loi, kms);
-
-        RETURN(0);
-}
-
 void lov_merge_attrs(struct obdo *tgt, struct obdo *src, obd_valid valid,
                      struct lov_stripe_md *lsm, int stripeno, int *set)
 {