X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Ffld_cache.c;h=8e4a691e74c191b1cfa48b87203b5388c110cbb3;hb=a68e117a54af82f209aed46a822f8346a3e0703f;hp=24c1f79725f4ef3df5e5c75d6758dc6fc09ab567;hpb=df497dc560062a0a0c7178498cba8853843d39f1;p=fs%2Flustre-release.git

diff --git a/lustre/fld/fld_cache.c b/lustre/fld/fld_cache.c
index 24c1f79..8e4a691 100644
--- a/lustre/fld/fld_cache.c
+++ b/lustre/fld/fld_cache.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,15 +43,9 @@
 
 #define DEBUG_SUBSYSTEM S_FLD
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-# include <linux/math64.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-# include <libcfs/list.h>
-#endif
-
+#include <libcfs/libcfs.h>
+#include <linux/module.h>
+#include <linux/math64.h>
 #include <obd_support.h>
 #include <lustre_fld.h>
 #include "fld_internal.h"
@@ -148,12 +142,12 @@ static void fld_fix_new_list(struct fld_cache *cache)
 restart_fixup:
 
 	list_for_each_entry_safe(f_curr, f_next, head, fce_list) {
-                c_range = &f_curr->fce_range;
-                n_range = &f_next->fce_range;
+		c_range = &f_curr->fce_range;
+		n_range = &f_next->fce_range;
 
-                LASSERT(range_is_sane(c_range));
-                if (&f_next->fce_list == head)
-                        break;
+		LASSERT(lu_seq_range_is_sane(c_range));
+		if (&f_next->fce_list == head)
+			break;
 
 		if (c_range->lsr_flags != n_range->lsr_flags)
 			continue;
@@ -272,8 +266,8 @@ static void fld_cache_punch_hole(struct fld_cache *cache,
 				 struct fld_cache_entry *f_new)
 {
         const struct lu_seq_range *range = &f_new->fce_range;
-        const seqno_t new_start  = range->lsr_start;
-        const seqno_t new_end  = range->lsr_end;
+	const u64 new_start  = range->lsr_start;
+	const u64 new_end  = range->lsr_end;
         struct fld_cache_entry *fldt;
 
         ENTRY;
@@ -313,10 +307,10 @@ static void fld_cache_overlap_handle(struct fld_cache *cache,
 				struct fld_cache_entry *f_curr,
 				struct fld_cache_entry *f_new)
 {
-        const struct lu_seq_range *range = &f_new->fce_range;
-        const seqno_t new_start  = range->lsr_start;
-        const seqno_t new_end  = range->lsr_end;
-        const mdsno_t mdt = range->lsr_index;
+	const struct lu_seq_range *range = &f_new->fce_range;
+	const u64 new_start  = range->lsr_start;
+	const u64 new_end  = range->lsr_end;
+	const u32 mdt = range->lsr_index;
 
         /* this is overlap case, these case are checking overlapping with
          * prev range only. fixup will handle overlaping with next range. */
@@ -375,7 +369,7 @@ struct fld_cache_entry
 {
 	struct fld_cache_entry *f_new;
 
-	LASSERT(range_is_sane(range));
+	LASSERT(lu_seq_range_is_sane(range));
 
 	OBD_ALLOC_PTR(f_new);
 	if (!f_new)
@@ -398,8 +392,8 @@ int fld_cache_insert_nolock(struct fld_cache *cache,
 	struct fld_cache_entry *n;
 	struct list_head *head;
 	struct list_head *prev = NULL;
-	const seqno_t new_start  = f_new->fce_range.lsr_start;
-	const seqno_t new_end  = f_new->fce_range.lsr_end;
+	const u64 new_start  = f_new->fce_range.lsr_start;
+	const u64 new_end  = f_new->fce_range.lsr_end;
 	__u32 new_flags  = f_new->fce_range.lsr_flags;
 	ENTRY;
 
@@ -532,7 +526,7 @@ fld_cache_entry_lookup(struct fld_cache *cache,
  * lookup \a seq sequence for range in fld cache.
  */
 int fld_cache_lookup(struct fld_cache *cache,
-		     const seqno_t seq, struct lu_seq_range *range)
+		     const u64 seq, struct lu_seq_range *range)
 {
 	struct fld_cache_entry *flde;
 	struct fld_cache_entry *prev = NULL;
@@ -551,10 +545,10 @@ int fld_cache_lookup(struct fld_cache *cache,
 		}
 
 		prev = flde;
-                if (range_within(&flde->fce_range, seq)) {
-                        *range = flde->fce_range;
+		if (lu_seq_range_within(&flde->fce_range, seq)) {
+			*range = flde->fce_range;
 
-                        cache->fci_stat.fst_cache++;
+			cache->fci_stat.fst_cache++;
 			read_unlock(&cache->fci_lock);
 			RETURN(0);
 		}