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.

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index f79193fa2fb7727d9450f016f746d2d9b6ca742c..8184d9d1da52797c1cfbc269c1c7e0f00ad636c2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -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);