X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffid%2Ffid_handler.c;h=9f378a5a1bb835d2706075179127497bf7685240;hb=4c0dcdf290c8f3fc74a2585e976d7fc430bc79c4;hp=1046b3cf7da16a996f74c1cd03872d992e76acb6;hpb=cd764a5462697261a9a6b1e6c6858c75d969bae1;p=fs%2Flustre-release.git

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 1046b3c..9f378a5 100644
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.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) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -94,13 +94,13 @@ EXPORT_SYMBOL(seq_server_set_cli);
  * allocate \a w units of sequence from range \a from.
  */
 static inline void range_alloc(struct lu_seq_range *to,
-                               struct lu_seq_range *from,
-                               __u64 width)
+			       struct lu_seq_range *from,
+			       __u64 width)
 {
-        width = min(range_space(from), width);
-        to->lsr_start = from->lsr_start;
-        to->lsr_end = from->lsr_start + width;
-        from->lsr_start += width;
+	width = min(lu_seq_range_space(from), width);
+	to->lsr_start = from->lsr_start;
+	to->lsr_end = from->lsr_start + width;
+	from->lsr_start += width;
 }
 
 /**
@@ -118,9 +118,9 @@ static int __seq_server_alloc_super(struct lu_server_seq *seq,
 	int rc;
 	ENTRY;
 
-	LASSERT(range_is_sane(space));
+	LASSERT(lu_seq_range_is_sane(space));
 
-	if (range_is_exhausted(space)) {
+	if (lu_seq_range_is_exhausted(space)) {
 		CERROR("%s: Sequences space is exhausted\n",
 		       seq->lss_name);
 		RETURN(-ENOSPC);
@@ -211,51 +211,52 @@ static int __seq_set_init(const struct lu_env *env,
  *
  * when lss_lowater_set reaches the end it is replaced with hiwater one and
  * a write operation is initiated to allocate new hiwater range.
- * if last seq write opearion is still not commited, current operation is
+ * if last seq write opearion is still not committed, current operation is
  * flaged as sync write op.
  */
 static int range_alloc_set(const struct lu_env *env,
-                           struct lu_seq_range *out,
-                           struct lu_server_seq *seq)
+			   struct lu_seq_range *out,
+			   struct lu_server_seq *seq)
 {
-        struct lu_seq_range *space = &seq->lss_space;
-        struct lu_seq_range *loset = &seq->lss_lowater_set;
-        struct lu_seq_range *hiset = &seq->lss_hiwater_set;
-        int rc = 0;
+	struct lu_seq_range *space = &seq->lss_space;
+	struct lu_seq_range *loset = &seq->lss_lowater_set;
+	struct lu_seq_range *hiset = &seq->lss_hiwater_set;
+	int rc = 0;
 
-        if (range_is_zero(loset))
-                __seq_set_init(env, seq);
+	if (lu_seq_range_is_zero(loset))
+		__seq_set_init(env, seq);
 
-        if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_ALLOC)) /* exhaust set */
-                loset->lsr_start = loset->lsr_end;
+	if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_ALLOC)) /* exhaust set */
+		loset->lsr_start = loset->lsr_end;
 
-        if (range_is_exhausted(loset)) {
-                /* reached high water mark. */
+	if (lu_seq_range_is_exhausted(loset)) {
+		/* reached high water mark. */
 		struct lu_device *dev = seq->lss_site->ss_lu->ls_top_dev;
-                int obd_num_clients = dev->ld_obd->obd_num_exports;
-                __u64 set_sz;
+		int obd_num_clients = dev->ld_obd->obd_num_exports;
+		__u64 set_sz;
 
-                /* calculate new seq width based on number of clients */
-                set_sz = max(seq->lss_set_width,
-                             obd_num_clients * seq->lss_width);
-                set_sz = min(range_space(space), set_sz);
+		/* calculate new seq width based on number of clients */
+		set_sz = max(seq->lss_set_width,
+			     obd_num_clients * seq->lss_width);
+		set_sz = min(lu_seq_range_space(space), set_sz);
 
-                /* Switch to hiwater range now */
-                *loset = *hiset;
-                /* allocate new hiwater range */
-                range_alloc(hiset, space, set_sz);
+		/* Switch to hiwater range now */
+		*loset = *hiset;
+		/* allocate new hiwater range */
+		range_alloc(hiset, space, set_sz);
 
-                /* update ondisk seq with new *space */
-                rc = seq_store_update(env, seq, NULL, seq->lss_need_sync);
-        }
+		/* update ondisk seq with new *space */
+		rc = seq_store_update(env, seq, NULL, seq->lss_need_sync);
+	}
 
-        LASSERTF(!range_is_exhausted(loset) || range_is_sane(loset),
-                 DRANGE"\n", PRANGE(loset));
+	LASSERTF(!lu_seq_range_is_exhausted(loset) ||
+		 lu_seq_range_is_sane(loset),
+		 DRANGE"\n", PRANGE(loset));
 
-        if (rc == 0)
-                range_alloc(out, loset, seq->lss_width);
+	if (rc == 0)
+		range_alloc(out, loset, seq->lss_width);
 
-        RETURN(rc);
+	RETURN(rc);
 }
 
 /**
@@ -280,7 +281,7 @@ int seq_server_check_and_alloc_super(const struct lu_env *env,
 	ENTRY;
 
 	/* Check if available space ends and allocate new super seq */
-	if (range_is_exhausted(space)) {
+	if (lu_seq_range_is_exhausted(space)) {
 		if (!seq->lss_cli) {
 			CERROR("%s: No sequence controller is attached.\n",
 			       seq->lss_name);
@@ -296,7 +297,7 @@ int seq_server_check_and_alloc_super(const struct lu_env *env,
 
 		/* Saving new range to allocation space. */
 		*space = seq->lss_cli->lcs_space;
-		LASSERT(range_is_sane(space));
+		LASSERT(lu_seq_range_is_sane(space));
 		if (seq->lss_cli->lcs_srv == NULL) {
 			struct lu_server_fld *fld;
 
@@ -308,7 +309,7 @@ int seq_server_check_and_alloc_super(const struct lu_env *env,
 		}
 	}
 
-	if (range_is_zero(&seq->lss_lowater_set))
+	if (lu_seq_range_is_zero(&seq->lss_lowater_set))
 		__seq_set_init(env, seq);
 
 	RETURN(rc);
@@ -324,7 +325,7 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq,
 
 	ENTRY;
 
-	LASSERT(range_is_sane(space));
+	LASSERT(lu_seq_range_is_sane(space));
 
 	rc = seq_server_check_and_alloc_super(env, seq);
 	if (rc < 0) {
@@ -526,11 +527,11 @@ int seq_server_init(const struct lu_env *env,
 	seq->lss_cli = NULL;
 	seq->lss_type = type;
 	seq->lss_site = ss;
-	range_init(&seq->lss_space);
+	lu_seq_range_init(&seq->lss_space);
 
-        range_init(&seq->lss_lowater_set);
-        range_init(&seq->lss_hiwater_set);
-        seq->lss_set_width = LUSTRE_SEQ_BATCH_WIDTH;
+	lu_seq_range_init(&seq->lss_lowater_set);
+	lu_seq_range_init(&seq->lss_hiwater_set);
+	seq->lss_set_width = LUSTRE_SEQ_BATCH_WIDTH;
 
 	mutex_init(&seq->lss_mutex);
 
@@ -568,12 +569,12 @@ int seq_server_init(const struct lu_env *env,
                 GOTO(out, rc);
         }
 
-        if (is_srv) {
-                LASSERT(range_is_sane(&seq->lss_space));
-        } else {
-                LASSERT(!range_is_zero(&seq->lss_space) &&
-                        range_is_sane(&seq->lss_space));
-        }
+	if (is_srv) {
+		LASSERT(lu_seq_range_is_sane(&seq->lss_space));
+	} else {
+		LASSERT(!lu_seq_range_is_zero(&seq->lss_space) &&
+			lu_seq_range_is_sane(&seq->lss_space));
+	}
 
         rc  = seq_server_proc_init(seq);
         if (rc)