Skip to contentSkip to conversation

Staging: lustre: rw: Remove wrapper stride_page_count

PATCH New Shivani Bhardwaj 1 participant 1 message Nov 7, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: lustre: rw: Remove wrapper stride_page_count

Remove the function stride_page_count() and replace its calls with the function stride_pg_count() that it wraps.

---
 drivers/staging/lustre/lustre/llite/rw.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/lustre/lustre/llite/rw.c +3 -9
index f79193f..8184d9d 100644
@@ -880,14 +880,6 @@ static void ras_update_stride_detector(struct ll_readahead_state *ras,
 	return;
 }
 
-static unsigned long
-stride_page_count(struct ll_readahead_state *ras, unsigned long len)
-{
-	return stride_pg_count(ras->ras_stride_offset, ras->ras_stride_length,
-			       ras->ras_stride_pages, ras->ras_stride_offset,
-			       len);
-}
-
 /* Stride Read-ahead window will be increased inc_len according to
  * stride I/O pattern */
 static void ras_stride_increase_window(struct ll_readahead_state *ras,
@@ -921,7 +913,9 @@ static void ras_stride_increase_window(struct ll_readahead_state *ras,
 
 	window_len += step * ras->ras_stride_length + left;
 
-	if (stride_page_count(ras, window_len) <= ra->ra_max_pages_per_file)
+	if (stride_pg_count(ras->ras_stride_offset, ras->ras_stride_length,
+			    ras->ras_stride_pages, ras->ras_stride_offset,
+			    window_len) <= ra->ra_max_pages_per_file)
 		ras->ras_window_len = window_len;
 
 	RAS_CDEBUG(ras);
Signature · 1 line
2.1.0