staging: lustre: obd: change brw_page->count to unsigned

Pages count is unsigned. So, change the type accordant usage.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5577
Reviewed-on: http://review.whamcloud.com/12378
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index cd7f552f41fd2d3229f9bc1a3841b352ece82533..d1c4ccc941d52c07ab17a7da9f090f37950115e1 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -176,7 +176,7 @@ struct obd_type {
 struct brw_page {
        u64 off;
        struct page *pg;
-       int count;
+       unsigned int count;
        u32 flag;
 };
 

diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index 5a0c1b2d7b5c1a42cc77f22e1914dae2bc3386c4..830a94b8452910000e4b05a82314918a24be61e6 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -1099,7 +1099,7 @@ static int osc_extent_make_ready(const struct lu_env *env,
        struct osc_async_page *oap;
        struct osc_async_page *last = NULL;
        struct osc_object *obj = ext->oe_obj;
-       int page_count = 0;
+       unsigned int page_count = 0;
        int rc;
 
        /* we're going to grab page lock, so object lock must not be taken. */
@@ -1140,9 +1140,11 @@ static int osc_extent_make_ready(const struct lu_env *env,
         * the size of file.
         */
        if (!(last->oap_async_flags & ASYNC_COUNT_STABLE)) {
-               last->oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE);
-               LASSERT(last->oap_count > 0);
-               LASSERT(last->oap_page_off + last->oap_count <= PAGE_SIZE);
+               int last_oap_count = osc_refresh_count(env, last, OBD_BRW_WRITE);
+
+               LASSERT(last_oap_count > 0);
+               LASSERT(last->oap_page_off + last_oap_count <= PAGE_SIZE);
+               last->oap_count = last_oap_count;
                spin_lock(&last->oap_lock);
                last->oap_async_flags |= ASYNC_COUNT_STABLE;
                spin_unlock(&last->oap_lock);

diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
index d41680b520951768dc56dd2bf7a894372ba2f7bc..3068113a467813401084a4cca5373955778f434b 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
@@ -64,7 +64,7 @@ struct osc_io {
        /** true if this io is lockless. */
        unsigned int            oi_lockless;
        /** how many LRU pages are reserved for this IO */
-       int oi_lru_reserved;
+       unsigned long           oi_lru_reserved;
 
        /** active extents, we know how many bytes is going to be written,
         * so having an active extent will prevent it from being fragmented