LU-5577 osc: change cl_extent_tax and *grants to unsigned

Change the type accordant usage and remove warnings.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: Iaaf45b3634a6d3667c0481c9e76c5ee69964c48c
Reviewed-on: http://review.whamcloud.com/12386
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index c646d96..90cab2f 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -243,7 +243,7 @@ struct client_obd {
        /* A chunk is an optimal size used by osc_extent to determine
         * the extent size. A chunk is max(PAGE_CACHE_SIZE, OST block size) */
        int                     cl_chunkbits;
-       int                     cl_extent_tax;  /* extent overhead, by bytes */
+       unsigned int            cl_extent_tax;  /* extent overhead, by bytes */
 
        /* keep track of objects that have lois that contain pages which
         * have been queued for async brw.  this lock also protects the

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index c15cac5..52870d5 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -48,7 +48,7 @@ static int extent_debug; /* set it to be true for more debug */
 
 static void osc_update_pending(struct osc_object *obj, int cmd, int delta);
 static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
-                          int state);
+                          enum osc_extent_state state);
 static void osc_ap_completion(const struct lu_env *env, struct client_obd *cli,
                              struct osc_async_page *oap, int sent, int rc);
 static int osc_make_ready(const struct lu_env *env, struct osc_async_page *oap,
@@ -181,7 +181,7 @@ static int osc_extent_sanity_check0(struct osc_extent *ext,
 {
        struct osc_object *obj = ext->oe_obj;
        struct osc_async_page *oap;
-       int page_count;
+       size_t page_count;
        int rc = 0;
 
        if (!osc_object_is_locked(obj))
@@ -598,8 +598,7 @@ static inline int overlapped(struct osc_extent *ex1, struct osc_extent *ex2)
  */
 static struct osc_extent *osc_extent_find(const struct lu_env *env,
                                          struct osc_object *obj, pgoff_t index,
-                                         int *grants)
-
+                                         unsigned int *grants)
 {
        struct client_obd *cli = osc_cli(obj);
        struct osc_lock   *olck;
@@ -610,10 +609,10 @@ static struct osc_extent *osc_extent_find(const struct lu_env *env,
        struct osc_extent *found = NULL;
        pgoff_t    chunk;
        pgoff_t    max_end;
-       int        max_pages; /* max_pages_per_rpc */
-       int        chunksize;
+       unsigned int max_pages; /* max_pages_per_rpc */
+       unsigned int chunksize;
        int        ppc_bits; /* pages per chunk bits */
-       int        chunk_mask;
+       pgoff_t    chunk_mask;
        int        rc;
        ENTRY;
 
@@ -668,8 +667,8 @@ restart:
        if (ext == NULL)
                ext = first_extent(obj);
        while (ext != NULL) {
-               loff_t ext_chk_start = ext->oe_start >> ppc_bits;
-               loff_t ext_chk_end   = ext->oe_end   >> ppc_bits;
+               pgoff_t ext_chk_start = ext->oe_start >> ppc_bits;
+               pgoff_t ext_chk_end   = ext->oe_end   >> ppc_bits;
 
                LASSERT(sanity_check_nolock(ext) == 0);
                if (chunk > ext_chk_end + 1)
@@ -872,7 +871,7 @@ int osc_extent_finish(const struct lu_env *env, struct osc_extent *ext,
        RETURN(0);
 }
 
-static int extent_wait_cb(struct osc_extent *ext, int state)
+static int extent_wait_cb(struct osc_extent *ext, enum osc_extent_state state)
 {
        int ret;
 
@@ -887,7 +886,7 @@ static int extent_wait_cb(struct osc_extent *ext, int state)
  * Wait for the extent's state to become @state.
  */
 static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
-                          int state)
+                          enum osc_extent_state state)
 {
        struct osc_object *obj = ext->oe_obj;
        struct l_wait_info lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(600), NULL,
@@ -916,7 +915,7 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
        rc = l_wait_event(ext->oe_waitq, extent_wait_cb(ext, state), &lwi);
        if (rc == -ETIMEDOUT) {
                OSC_EXTENT_DUMP(D_ERROR, ext,
-                       "%s: wait ext to %d timedout, recovery in progress?\n",
+                       "%s: wait ext to %u timedout, recovery in progress?\n",
                        osc_export(obj)->exp_obd->obd_name, state);
 
                lwi = LWI_INTR(NULL, NULL);
@@ -1132,7 +1131,8 @@ static int osc_extent_make_ready(const struct lu_env *env,
  * called to expand the extent for the same IO. To expand the extent, the
  * page index must be in the same or next chunk of ext->oe_end.
  */
-static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants)
+static int osc_extent_expand(struct osc_extent *ext, pgoff_t index,
+                            unsigned int *grants)
 {
        struct osc_object *obj = ext->oe_obj;
        struct client_obd *cli = osc_cli(obj);
@@ -1141,7 +1141,7 @@ static int osc_extent_expand(struct osc_extent *ext, pgoff_t index, int *grants)
        pgoff_t chunk = index >> ppc_bits;
        pgoff_t end_chunk;
        pgoff_t end_index;
-       int chunksize = 1 << cli->cl_chunkbits;
+       unsigned int chunksize = 1 << cli->cl_chunkbits;
        int rc = 0;
        ENTRY;
 
@@ -1318,7 +1318,7 @@ static int osc_completion(const struct lu_env *env, struct osc_async_page *oap,
        if (rc == 0 && srvlock) {
                struct lu_device *ld    = opg->ops_cl.cpl_obj->co_lu.lo_dev;
                struct osc_stats *stats = &lu2osc_dev(ld)->od_stats;
-               int bytes = oap->oap_count;
+               size_t bytes = oap->oap_count;
 
                if (crt == CRT_READ)
                        stats->os_lockless_reads += bytes;
@@ -1451,7 +1451,7 @@ static void osc_unreserve_grant(struct client_obd *cli,
 static void osc_free_grant(struct client_obd *cli, unsigned int nr_pages,
                           unsigned int lost_grant)
 {
-       int grant = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
+       unsigned long grant = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
 
        spin_lock(&cli->cl_loi_list_lock);
        atomic_long_sub(nr_pages, &obd_dirty_pages);
@@ -1847,7 +1847,7 @@ static void osc_ap_completion(const struct lu_env *env, struct client_obd *cli,
 static int try_to_add_extent_for_io(struct client_obd *cli,
                                    struct osc_extent *ext,
                                    struct list_head *rpclist,
-                                   int *pc, unsigned int *max_pages)
+                                   unsigned int *pc, unsigned int *max_pages)
 {
        struct osc_extent *tmp;
        struct osc_async_page *oap = list_first_entry(&ext->oe_pages,
@@ -1906,11 +1906,12 @@ static int try_to_add_extent_for_io(struct client_obd *cli,
  * 5. Traverse the extent tree from the 1st extent;
  * 6. Above steps exit if there is no space in this RPC.
  */
-static int get_write_extents(struct osc_object *obj, struct list_head *rpclist)
+static unsigned int get_write_extents(struct osc_object *obj,
+                                     struct list_head *rpclist)
 {
        struct client_obd *cli = osc_cli(obj);
        struct osc_extent *ext;
-       int page_count = 0;
+       unsigned int page_count = 0;
        unsigned int max_pages = cli->cl_max_pages_per_rpc;
 
        LASSERT(osc_object_is_locked(obj));
@@ -1977,7 +1978,7 @@ __must_hold(osc)
        struct osc_extent *ext;
        struct osc_extent *tmp;
        struct osc_extent *first = NULL;
-       obd_count page_count = 0;
+       unsigned int page_count = 0;
        int srvlock = 0;
        int rc = 0;
        ENTRY;
@@ -2050,7 +2051,7 @@ __must_hold(osc)
        struct osc_extent *ext;
        struct osc_extent *next;
        struct list_head rpclist = LIST_HEAD_INIT(rpclist);
-       int page_count = 0;
+       unsigned int page_count = 0;
        unsigned int max_pages = cli->cl_max_pages_per_rpc;
        int rc = 0;
        ENTRY;
@@ -2268,7 +2269,8 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
        struct client_obd     *cli = oap->oap_cli;
        struct osc_object     *osc = oap->oap_obj;
        pgoff_t index;
-       int    grants = 0;
+       unsigned int tmp;
+       unsigned int grants = 0;
        int    brw_flags = OBD_BRW_ASYNC;
        int    cmd = OBD_BRW_WRITE;
        int    need_release = 0;
@@ -2349,7 +2351,7 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
                        grants = 0;
                        need_release = 1;
                } else if (ext->oe_end < index) {
-                       int tmp = grants;
+                       tmp = grants;
                        /* try to expand this extent */
                        rc = osc_extent_expand(ext, index, &tmp);
                        if (rc < 0) {
@@ -2374,7 +2376,7 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
        }
 
        if (ext == NULL) {
-               int tmp = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
+               tmp = (1 << cli->cl_chunkbits) + cli->cl_extent_tax;
 
                /* try to find new extent to cover this page */
                LASSERT(oio->oi_active == NULL);

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index 1518db4..4883693 100644 (file)
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -622,7 +622,7 @@ struct osc_extent {
        /** link list of osc_object's oo_{hp|urgent|locking}_exts. */
        struct list_head        oe_link;
        /** state of this extent */
-       unsigned int            oe_state;
+       enum osc_extent_state   oe_state;
        /** flags for this extent. */
        unsigned int            oe_intree:1,
        /** 0 is write, 1 is read */

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index 11157c7..ef94484 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -113,11 +113,11 @@ static int osc_io_submit(const struct lu_env *env,
 
        struct cl_page_list *qin      = &queue->c2_qin;
        struct cl_page_list *qout     = &queue->c2_qout;
-       int queued = 0;
+       unsigned int queued = 0;
        int result = 0;
        int cmd;
        int brw_flags;
-       int max_pages;
+       unsigned int max_pages;
 
        LASSERT(qin->pl_nr > 0);
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 6b90eff..5fdeb24 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1078,7 +1078,7 @@ static obd_count osc_checksum_bulk(int nob, obd_count pg_count,
        }
 
        while (nob > 0 && pg_count > 0) {
-               int count = pga[i]->count > nob ? nob : pga[i]->count;
+               unsigned int count = pga[i]->count > nob ? nob : pga[i]->count;
 
                /* corrupt the data before we compute the checksum, to
                 * simulate an OST->client data error */
@@ -1087,7 +1087,7 @@ static obd_count osc_checksum_bulk(int nob, obd_count pg_count,
                        unsigned char *ptr = kmap(pga[i]->pg);
                        int off = pga[i]->off & ~CFS_PAGE_MASK;
 
-                       memcpy(ptr + off, "bad1", min(4, nob));
+                       memcpy(ptr + off, "bad1", min_t(typeof(nob), 4, nob));
                        kunmap(pga[i]->pg);
                }
                cfs_crypto_hash_update_page(hdesc, pga[i]->pg,
@@ -1372,7 +1372,7 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
                         &req->rq_import->imp_connection->c_peer;
         struct client_obd *cli = aa->aa_cli;
         struct ost_body *body;
-        __u32 client_cksum = 0;
+       u32 client_cksum = 0;
         ENTRY;
 
         if (rc < 0 && rc != -EDQUOT) {
@@ -1452,7 +1452,7 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
 
         if (body->oa.o_valid & OBD_MD_FLCKSUM) {
                 static int cksum_counter;
-                __u32      server_cksum = body->oa.o_cksum;
+               u32        server_cksum = body->oa.o_cksum;
                 char      *via;
                 char      *router;
                 cksum_type_t cksum_type;