staging: lustre: lustre: fix all bare unsigned usage

Turn all bare unsigned usage in the lustre code to proper
unsigned int.

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/cl_object.h b/drivers/staging/lustre/lustre/include/cl_object.h
index 2bc3ee51b0691eb60351f472aa9db6c5412a1042..90a0c501e1ead97eabfb2cb7c767975b389fc2ab 100644 (file)
--- a/drivers/staging/lustre/lustre/include/cl_object.h
+++ b/drivers/staging/lustre/lustre/include/cl_object.h
@@ -1287,7 +1287,7 @@ do {                                                                  \
  * @{
  */
 struct cl_page_list {
-       unsigned             pl_nr;
+       unsigned int             pl_nr;
        struct list_head           pl_pages;
        struct task_struct      *pl_owner;
 };
@@ -1842,7 +1842,7 @@ struct cl_io {
        /**
         * Number of pages owned by this IO. For invariant checking.
         */
-       unsigned             ci_owned_nr;
+       unsigned int         ci_owned_nr;
 };
 
 /** @} cl_io */

diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
index 73ecc232967b840bd35ee2d962e301f6f8fff932..2e70602dc2e26713b09174907d8ebf4e6b40bae2 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -968,11 +968,11 @@ struct lu_context {
         * Version counter used to skip calls to lu_context_refill() when no
         * keys were registered.
         */
-       unsigned               lc_version;
+       unsigned int            lc_version;
        /**
         * Debugging cookie.
         */
-       unsigned               lc_cookie;
+       unsigned int            lc_cookie;
 };
 
 /**

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 9f118a1a57fc2c84bcddbc98db207786d177906c..a208a8b02c2cdd8295c27a32fa5baec374542354 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -678,7 +678,7 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
  * together.
  */
 static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
-                         struct file *file, unsigned open_flags,
+                         struct file *file, unsigned int open_flags,
                          umode_t mode, int *opened)
 {
        struct lookup_intent *it;

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 22dc6a59e332f6dd20d84d4a2ac1a1bc44933c97..3619cd8bb5f360b40e09a4aee54111e8bea35d87 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -547,7 +547,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
 }
 
 static int ll_write_end(struct file *file, struct address_space *mapping,
-                       loff_t pos, unsigned len, unsigned copied,
+                       loff_t pos, unsigned int len, unsigned int copied,
                        struct page *vmpage, void *fsdata)
 {
        struct ll_cl_context *lcc = fsdata;

diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
index 6cb2db28eb605fffddc2ade016e7892a98a3e73f..8e45672b4617a7bfc2858c671597e9347ff8c3dc 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/vvp_dev.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c
@@ -381,11 +381,11 @@ int cl_sb_fini(struct super_block *sb)
 #define PGC_DEPTH_SHIFT (32)
 
 struct vvp_pgcache_id {
-       unsigned                 vpi_bucket;
-       unsigned                 vpi_depth;
+       unsigned int             vpi_bucket;
+       unsigned int             vpi_depth;
        uint32_t                 vpi_index;
 
-       unsigned                 vpi_curdep;
+       unsigned int             vpi_curdep;
        struct lu_object_header *vpi_obj;
 };
 

diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c
index 4db8116d2c32a3e14ce852ec2581704c7588a7ff..d8a95f8fe1ff5d03420f036622008f76d00086fa 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_cache.c
+++ b/drivers/staging/lustre/lustre/osc/osc_cache.c
@@ -1889,10 +1889,10 @@ struct extent_rpc_data {
        unsigned int            erd_max_chunks;
 };
 
-static inline unsigned osc_extent_chunks(const struct osc_extent *ext)
+static inline unsigned int osc_extent_chunks(const struct osc_extent *ext)
 {
        struct client_obd *cli = osc_cli(ext->oe_obj);
-       unsigned ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;
+       unsigned int ppc_bits = cli->cl_chunkbits - PAGE_SHIFT;
 
        return (ext->oe_end >> ppc_bits) - (ext->oe_start >> ppc_bits) + 1;
 }
@@ -1950,7 +1950,7 @@ static int try_to_add_extent_for_io(struct client_obd *cli,
        return 1;
 }
 
-static inline unsigned osc_max_write_chunks(const struct client_obd *cli)
+static inline unsigned int osc_max_write_chunks(const struct client_obd *cli)
 {
        /*
         * LU-8135:

diff --git a/drivers/staging/lustre/lustre/osc/osc_internal.h b/drivers/staging/lustre/lustre/osc/osc_internal.h
index 845e795d879590d6affcba303c5bfe0aed373317..13a40f6423ff430005bab3182ccfe3682cfac4cc 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_internal.h
@@ -62,7 +62,7 @@ struct osc_async_page {
        struct list_head              oap_rpc_item;
 
        u64              oap_obj_off;
-       unsigned                oap_page_off;
+       unsigned int            oap_page_off;
        enum async_flags        oap_async_flags;
 
        struct brw_page  oap_brw_page;