b=19188

r=rread,fanyong

cleanup the variables with `_', rename them to `unused'

diff --git a/lustre/cmm/cmm_object.c b/lustre/cmm/cmm_object.c
index fb3095c..2893511 100644 (file)
--- a/lustre/cmm/cmm_object.c
+++ b/lustre/cmm/cmm_object.c
@@ -160,7 +160,7 @@ static void cml_object_free(const struct lu_env *env,
 }
 
 static int cml_object_init(const struct lu_env *env, struct lu_object *lo,
 }
 
 static int cml_object_init(const struct lu_env *env, struct lu_object *lo,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         struct cmm_device *cd = lu2cmm_dev(lo->lo_dev);
         struct lu_device  *c_dev;
 {
         struct cmm_device *cd = lu2cmm_dev(lo->lo_dev);
         struct lu_device  *c_dev;


@@ -822,7 +822,7 @@ static void cmr_object_free(const struct lu_env *env,
 }
 
 static int cmr_object_init(const struct lu_env *env, struct lu_object *lo,
 }
 
 static int cmr_object_init(const struct lu_env *env, struct lu_object *lo,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         struct cmm_device *cd = lu2cmm_dev(lo->lo_dev);
         struct lu_device  *c_dev;
 {
         struct cmm_device *cd = lu2cmm_dev(lo->lo_dev);
         struct lu_device  *c_dev;

diff --git a/lustre/cmm/mdc_object.c b/lustre/cmm/mdc_object.c
index 2e884ba..18186b7 100644 (file)
--- a/lustre/cmm/mdc_object.c
+++ b/lustre/cmm/mdc_object.c
@@ -87,7 +87,7 @@ static void mdc_object_free(const struct lu_env *env, struct lu_object *lo)
 }
 
 static int mdc_object_init(const struct lu_env *env, struct lu_object *lo,
 }
 
 static int mdc_object_init(const struct lu_env *env, struct lu_object *lo,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         ENTRY;
         lo->lo_header->loh_attr |= LOHA_REMOTE;
 {
         ENTRY;
         lo->lo_header->loh_attr |= LOHA_REMOTE;

diff --git a/lustre/lclient/lcommon_cl.c b/lustre/lclient/lcommon_cl.c
index 78cdc63..2f0419c 100644 (file)
--- a/lustre/lclient/lcommon_cl.c
+++ b/lustre/lclient/lcommon_cl.c
@@ -337,7 +337,7 @@ void ccc_global_fini(struct lu_device_type *device_type)
  */
 
 struct lu_object *ccc_object_alloc(const struct lu_env *env,
  */
 
 struct lu_object *ccc_object_alloc(const struct lu_env *env,

-                                   const struct lu_object_header *_,
+                                   const struct lu_object_header *unused,

                                    struct lu_device *dev,
                                    const struct cl_object_operations *clops,
                                    const struct lu_object_operations *luops)
                                    struct lu_device *dev,
                                    const struct cl_object_operations *clops,
                                    const struct lu_object_operations *luops)


@@ -405,7 +405,7 @@ void ccc_object_free(const struct lu_env *env, struct lu_object *obj)
 
 int ccc_lock_init(const struct lu_env *env,
                   struct cl_object *obj, struct cl_lock *lock,
 
 int ccc_lock_init(const struct lu_env *env,
                   struct cl_object *obj, struct cl_lock *lock,

-                  const struct cl_io *_,
+                  const struct cl_io *unused,

                   const struct cl_lock_operations *lkops)
 {
         struct ccc_lock *clk;
                   const struct cl_lock_operations *lkops)
 {
         struct ccc_lock *clk;


@@ -505,35 +505,35 @@ void ccc_transient_page_verify(const struct cl_page *page)
 
 void ccc_transient_page_own(const struct lu_env *env,
                                    const struct cl_page_slice *slice,
 
 void ccc_transient_page_own(const struct lu_env *env,
                                    const struct cl_page_slice *slice,

-                                   struct cl_io *_)
+                                   struct cl_io *unused)

 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_assume(const struct lu_env *env,
                                       const struct cl_page_slice *slice,
 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_assume(const struct lu_env *env,
                                       const struct cl_page_slice *slice,

-                                      struct cl_io *_)
+                                      struct cl_io *unused)

 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_unassume(const struct lu_env *env,
                                         const struct cl_page_slice *slice,
 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_unassume(const struct lu_env *env,
                                         const struct cl_page_slice *slice,

-                                        struct cl_io *_)
+                                        struct cl_io *unused)

 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_disown(const struct lu_env *env,
                                       const struct cl_page_slice *slice,
 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_disown(const struct lu_env *env,
                                       const struct cl_page_slice *slice,

-                                      struct cl_io *_)
+                                      struct cl_io *unused)

 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_discard(const struct lu_env *env,
                                        const struct cl_page_slice *slice,
 {
         ccc_transient_page_verify(slice->cpl_page);
 }
 
 void ccc_transient_page_discard(const struct lu_env *env,
                                        const struct cl_page_slice *slice,

-                                       struct cl_io *_)
+                                       struct cl_io *unused)

 {
         struct cl_page *page = slice->cpl_page;
 
 {
         struct cl_page *page = slice->cpl_page;
 


@@ -547,7 +547,7 @@ void ccc_transient_page_discard(const struct lu_env *env,
 
 int ccc_transient_page_prep(const struct lu_env *env,
                                    const struct cl_page_slice *slice,
 
 int ccc_transient_page_prep(const struct lu_env *env,
                                    const struct cl_page_slice *slice,

-                                   struct cl_io *_)
+                                   struct cl_io *unused)

 {
         ENTRY;
         /* transient page should always be sent. */
 {
         ENTRY;
         /* transient page should always be sent. */


@@ -574,7 +574,7 @@ void ccc_lock_fini(const struct lu_env *env, struct cl_lock_slice *slice)
 
 int ccc_lock_enqueue(const struct lu_env *env,
                      const struct cl_lock_slice *slice,
 
 int ccc_lock_enqueue(const struct lu_env *env,
                      const struct cl_lock_slice *slice,

-                     struct cl_io *_, __u32 enqflags)
+                     struct cl_io *unused, __u32 enqflags)

 {
         CLOBINVRNT(env, slice->cls_obj, ccc_object_invariant(slice->cls_obj));
         return 0;
 {
         CLOBINVRNT(env, slice->cls_obj, ccc_object_invariant(slice->cls_obj));
         return 0;

diff --git a/lustre/liblustre/llite_cl.c b/lustre/liblustre/llite_cl.c
index 2557dbc..aa5b72c 100644 (file)
--- a/lustre/liblustre/llite_cl.c
+++ b/lustre/liblustre/llite_cl.c
@@ -405,7 +405,7 @@ static const struct cl_page_operations slp_transient_page_ops = {
 
 static int slp_lock_enqueue(const struct lu_env *env,
                            const struct cl_lock_slice *slice,
 
 static int slp_lock_enqueue(const struct lu_env *env,
                            const struct cl_lock_slice *slice,

-                           struct cl_io *_, __u32 enqflags)
+                           struct cl_io *unused, __u32 enqflags)

 {
         CLOBINVRNT(env, slice->cls_obj, ccc_object_invariant(slice->cls_obj));
 
 {
         CLOBINVRNT(env, slice->cls_obj, ccc_object_invariant(slice->cls_obj));
 

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 827f644..00ed8e5 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -1086,7 +1086,7 @@ out_unlock:
         return;
 }
 
         return;
 }
 

-int ll_writepage(struct page *vmpage, struct writeback_control *_)
+int ll_writepage(struct page *vmpage, struct writeback_control *unused)

 {
         struct inode           *inode = vmpage->mapping->host;
         struct lu_env          *env;
 {
         struct inode           *inode = vmpage->mapping->host;
         struct lu_env          *env;

diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c
index f543f59..c57ce84 100644 (file)
--- a/lustre/llite/vvp_page.c
+++ b/lustre/llite/vvp_page.c
@@ -79,7 +79,7 @@ static void vvp_page_fini(const struct lu_env *env,
 }
 
 static void vvp_page_own(const struct lu_env *env,
 }
 
 static void vvp_page_own(const struct lu_env *env,

-                         const struct cl_page_slice *slice, struct cl_io *_)
+                         const struct cl_page_slice *slice, struct cl_io *io)

 {
         struct ccc_page *vpg    = cl2ccc_page(slice);
         cfs_page_t      *vmpage = vpg->cpg_page;
 {
         struct ccc_page *vpg    = cl2ccc_page(slice);
         cfs_page_t      *vmpage = vpg->cpg_page;


@@ -97,7 +97,7 @@ static void vvp_page_own(const struct lu_env *env,
                                       "XXX page %p blocked on acquiring the"
                                       " lock. process %s/%p, flags %lx,io %p\n",
                                       vmpage, current->comm, current,
                                       "XXX page %p blocked on acquiring the"
                                       " lock. process %s/%p, flags %lx,io %p\n",
                                       vmpage, current->comm, current,

-                                      vmpage->flags, _);
+                                      vmpage->flags, io);

                         libcfs_debug_dumpstack(NULL);
                         LCONSOLE_WARN("Reproduced bug #18881,please contact:"
                                "jay <jinshan.xiong@sun.com>, thanks\n");
                         libcfs_debug_dumpstack(NULL);
                         LCONSOLE_WARN("Reproduced bug #18881,please contact:"
                                "jay <jinshan.xiong@sun.com>, thanks\n");


@@ -113,7 +113,8 @@ static void vvp_page_own(const struct lu_env *env,
 }
 
 static void vvp_page_assume(const struct lu_env *env,
 }
 
 static void vvp_page_assume(const struct lu_env *env,

-                            const struct cl_page_slice *slice, struct cl_io *_)
+                            const struct cl_page_slice *slice,
+                            struct cl_io *unused)

 {
         cfs_page_t *vmpage = cl2vm_page(slice);
 
 {
         cfs_page_t *vmpage = cl2vm_page(slice);
 


@@ -124,7 +125,7 @@ static void vvp_page_assume(const struct lu_env *env,
 
 static void vvp_page_unassume(const struct lu_env *env,
                               const struct cl_page_slice *slice,
 
 static void vvp_page_unassume(const struct lu_env *env,
                               const struct cl_page_slice *slice,

-                              struct cl_io *_)
+                              struct cl_io *unused)

 {
         cfs_page_t *vmpage = cl2vm_page(slice);
 
 {
         cfs_page_t *vmpage = cl2vm_page(slice);
 


@@ -144,7 +145,8 @@ static void vvp_page_disown(const struct lu_env *env,
 }
 
 static void vvp_page_discard(const struct lu_env *env,
 }
 
 static void vvp_page_discard(const struct lu_env *env,

-                             const struct cl_page_slice *slice, struct cl_io *_)
+                             const struct cl_page_slice *slice,
+                             struct cl_io *unused)

 {
         cfs_page_t           *vmpage  = cl2vm_page(slice);
         struct address_space *mapping = vmpage->mapping;
 {
         cfs_page_t           *vmpage  = cl2vm_page(slice);
         struct address_space *mapping = vmpage->mapping;


@@ -164,7 +166,8 @@ static void vvp_page_discard(const struct lu_env *env,
 }
 
 static int vvp_page_unmap(const struct lu_env *env,
 }
 
 static int vvp_page_unmap(const struct lu_env *env,

-                          const struct cl_page_slice *slice, struct cl_io *_)
+                          const struct cl_page_slice *slice,
+                          struct cl_io *unused)

 {
         cfs_page_t *vmpage = cl2vm_page(slice);
         __u64       offset = vmpage->index << CFS_PAGE_SHIFT;
 {
         cfs_page_t *vmpage = cl2vm_page(slice);
         __u64       offset = vmpage->index << CFS_PAGE_SHIFT;


@@ -216,7 +219,7 @@ static int vvp_page_is_vmlocked(const struct lu_env *env,
 
 static int vvp_page_prep_read(const struct lu_env *env,
                               const struct cl_page_slice *slice,
 
 static int vvp_page_prep_read(const struct lu_env *env,
                               const struct cl_page_slice *slice,

-                              struct cl_io *_)
+                              struct cl_io *unused)

 {
         ENTRY;
         /* Skip the page already marked as PG_uptodate. */
 {
         ENTRY;
         /* Skip the page already marked as PG_uptodate. */


@@ -225,7 +228,7 @@ static int vvp_page_prep_read(const struct lu_env *env,
 
 static int vvp_page_prep_write(const struct lu_env *env,
                                const struct cl_page_slice *slice,
 
 static int vvp_page_prep_write(const struct lu_env *env,
                                const struct cl_page_slice *slice,

-                               struct cl_io *_)
+                               struct cl_io *unused)

 {
         cfs_page_t *vmpage = cl2vm_page(slice);
         int result;
 {
         cfs_page_t *vmpage = cl2vm_page(slice);
         int result;


@@ -458,35 +461,35 @@ static void vvp_transient_page_verify(const struct cl_page *page)
 
 static void vvp_transient_page_own(const struct lu_env *env,
                                    const struct cl_page_slice *slice,
 
 static void vvp_transient_page_own(const struct lu_env *env,
                                    const struct cl_page_slice *slice,

-                                   struct cl_io *_)
+                                   struct cl_io *unused)

 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_assume(const struct lu_env *env,
                                       const struct cl_page_slice *slice,
 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_assume(const struct lu_env *env,
                                       const struct cl_page_slice *slice,

-                                      struct cl_io *_)
+                                      struct cl_io *unused)

 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_unassume(const struct lu_env *env,
                                         const struct cl_page_slice *slice,
 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_unassume(const struct lu_env *env,
                                         const struct cl_page_slice *slice,

-                                        struct cl_io *_)
+                                        struct cl_io *unused)

 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_disown(const struct lu_env *env,
                                       const struct cl_page_slice *slice,
 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_disown(const struct lu_env *env,
                                       const struct cl_page_slice *slice,

-                                      struct cl_io *_)
+                                      struct cl_io *unused)

 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_discard(const struct lu_env *env,
                                        const struct cl_page_slice *slice,
 {
         vvp_transient_page_verify(slice->cpl_page);
 }
 
 static void vvp_transient_page_discard(const struct lu_env *env,
                                        const struct cl_page_slice *slice,

-                                       struct cl_io *_)
+                                       struct cl_io *unused)

 {
         struct cl_page *page = slice->cpl_page;
 
 {
         struct cl_page *page = slice->cpl_page;
 

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index b45bf67..a2bbad1 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -675,7 +675,7 @@ static const struct lu_object_operations lov_lu_obj_ops = {
 };
 
 struct lu_object *lov_object_alloc(const struct lu_env *env,
 };
 
 struct lu_object *lov_object_alloc(const struct lu_env *env,

-                                   const struct lu_object_header *_,
+                                   const struct lu_object_header *unused,

                                    struct lu_device *dev)
 {
         struct lov_object *lov;
                                    struct lu_device *dev)
 {
         struct lov_object *lov;

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index 39f4edd..c1bd3de 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -134,7 +134,7 @@ static const struct lu_object_operations lovsub_lu_obj_ops = {
 };
 
 struct lu_object *lovsub_object_alloc(const struct lu_env *env,
 };
 
 struct lu_object *lovsub_object_alloc(const struct lu_env *env,

-                                      const struct lu_object_header *_,
+                                      const struct lu_object_header *unused,

                                       struct lu_device *dev)
 {
         struct lovsub_object *los;
                                       struct lu_device *dev)
 {
         struct lovsub_object *los;

diff --git a/lustre/lov/lovsub_page.c b/lustre/lov/lovsub_page.c
index 59bd749..ff67397 100644 (file)
--- a/lustre/lov/lovsub_page.c
+++ b/lustre/lov/lovsub_page.c
@@ -65,7 +65,7 @@ static const struct cl_page_operations lovsub_page_ops = {
 
 struct cl_page *lovsub_page_init(const struct lu_env *env,
                                  struct cl_object *obj,
 
 struct cl_page *lovsub_page_init(const struct lu_env *env,
                                  struct cl_object *obj,

-                                 struct cl_page *page, cfs_page_t *_)
+                                 struct cl_page *page, cfs_page_t *unused)

 {
         struct lovsub_page *lsb;
         int result;
 {
         struct lovsub_page *lsb;
         int result;

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index c2b1d7e..9567c38 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -265,7 +265,7 @@ struct lu_object *mdd_object_alloc(const struct lu_env *env,
 }
 
 static int mdd_object_init(const struct lu_env *env, struct lu_object *o,
 }
 
 static int mdd_object_init(const struct lu_env *env, struct lu_object *o,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         struct mdd_device *d = lu2mdd_dev(o->lo_dev);
         struct mdd_object *mdd_obj = lu2mdd_obj(o);
 {
         struct mdd_device *d = lu2mdd_dev(o->lo_dev);
         struct mdd_object *mdd_obj = lu2mdd_obj(o);

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index ca8d64a..66bd145 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -4830,7 +4830,7 @@ static struct lu_object *mdt_object_alloc(const struct lu_env *env,
 }
 
 static int mdt_object_init(const struct lu_env *env, struct lu_object *o,
 }
 
 static int mdt_object_init(const struct lu_env *env, struct lu_object *o,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         struct mdt_device *d = mdt_dev(o->lo_dev);
         struct lu_device  *under;
 {
         struct mdt_device *d = mdt_dev(o->lo_dev);
         struct lu_device  *under;

diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c
index 6f8f62f..0c07d53 100644 (file)
--- a/lustre/obdclass/lu_object.c
+++ b/lustre/obdclass/lu_object.c
@@ -1476,7 +1476,7 @@ struct lu_env lu_debugging_env;
  * Debugging printer function using printk().
  */
 int lu_printk_printer(const struct lu_env *env,
  * Debugging printer function using printk().
  */
 int lu_printk_printer(const struct lu_env *env,

-                      void *_, const char *format, ...)
+                      void *unused, const char *format, ...)

 {
         va_list args;
 
 {
         va_list args;
 

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index ec96354..fdb2ecb 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -256,7 +256,7 @@ cfs_page_t *echo_page_vmpage(const struct lu_env *env,
 
 static void echo_page_discard(const struct lu_env *env,
                               const struct cl_page_slice *slice,
 
 static void echo_page_discard(const struct lu_env *env,
                               const struct cl_page_slice *slice,

-                              struct cl_io *_)
+                              struct cl_io *unused)

 {
         cl_page_delete(env, slice->cpl_page);
 }
 {
         cl_page_delete(env, slice->cpl_page);
 }


@@ -297,7 +297,7 @@ static void echo_page_fini(const struct lu_env *env,
 
 static int echo_page_prep(const struct lu_env *env,
                           const struct cl_page_slice *slice,
 
 static int echo_page_prep(const struct lu_env *env,
                           const struct cl_page_slice *slice,

-                          struct cl_io *_)
+                          struct cl_io *unused)

 {
         return 0;
 }
 {
         return 0;
 }


@@ -358,7 +358,7 @@ static void echo_lock_delete(const struct lu_env *env,
 static int echo_lock_fits_into(const struct lu_env *env,
                                const struct cl_lock_slice *slice,
                                const struct cl_lock_descr *need,
 static int echo_lock_fits_into(const struct lu_env *env,
                                const struct cl_lock_slice *slice,
                                const struct cl_lock_descr *need,

-                               const struct cl_io *_)
+                               const struct cl_io *unused)

 {
         return 1;
 }
 {
         return 1;
 }


@@ -403,7 +403,7 @@ static int echo_io_init(const struct lu_env *env, struct cl_object *obj,
 
 static int echo_lock_init(const struct lu_env *env,
                           struct cl_object *obj, struct cl_lock *lock,
 
 static int echo_lock_init(const struct lu_env *env,
                           struct cl_object *obj, struct cl_lock *lock,

-                          const struct cl_io *_)
+                          const struct cl_io *unused)

 {
         struct echo_lock *el;
         ENTRY;
 {
         struct echo_lock *el;
         ENTRY;


@@ -1049,7 +1049,7 @@ static int cl_echo_cancel(struct echo_device *ed, __u64 cookie)
 }
 
 static int cl_echo_async_brw(const struct lu_env *env, struct cl_io *io,
 }
 
 static int cl_echo_async_brw(const struct lu_env *env, struct cl_io *io,

-                             enum cl_req_type _, struct cl_2queue *queue)
+                             enum cl_req_type unused, struct cl_2queue *queue)

 {
         struct cl_page *clp;
         struct cl_page *temp;
 {
         struct cl_page *clp;
         struct cl_page *temp;

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index f77c342..d14acdc 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -1251,7 +1251,7 @@ static int osc_deadlock_is_possible(const struct lu_env *env,
  */
 static int osc_lock_enqueue(const struct lu_env *env,
                             const struct cl_lock_slice *slice,
  */
 static int osc_lock_enqueue(const struct lu_env *env,
                             const struct cl_lock_slice *slice,

-                            struct cl_io *_, __u32 enqflags)
+                            struct cl_io *unused, __u32 enqflags)

 {
         struct osc_lock          *ols     = cl2osc_lock(slice);
         struct cl_lock           *lock    = ols->ols_cl.cls_lock;
 {
         struct osc_lock          *ols     = cl2osc_lock(slice);
         struct cl_lock           *lock    = ols->ols_cl.cls_lock;


@@ -1582,7 +1582,7 @@ static const struct cl_lock_operations osc_lock_ops = {
 
 static int osc_lock_lockless_enqueue(const struct lu_env *env,
                                      const struct cl_lock_slice *slice,
 
 static int osc_lock_lockless_enqueue(const struct lu_env *env,
                                      const struct cl_lock_slice *slice,

-                                     struct cl_io *_, __u32 enqflags)
+                                     struct cl_io *unused, __u32 enqflags)

 {
         LBUG();
         return 0;
 {
         LBUG();
         return 0;


@@ -1668,7 +1668,7 @@ static const struct cl_lock_operations osc_lock_lockless_ops = {
 
 int osc_lock_init(const struct lu_env *env,
                   struct cl_object *obj, struct cl_lock *lock,
 
 int osc_lock_init(const struct lu_env *env,
                   struct cl_object *obj, struct cl_lock *lock,

-                  const struct cl_io *_)
+                  const struct cl_io *unused)

 {
         struct osc_lock *clk;
         int result;
 {
         struct osc_lock *clk;
         int result;

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index 775b888..9e42f2e 100644 (file)
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.c
@@ -223,7 +223,7 @@ static const struct lu_object_operations osc_lu_obj_ops = {
 };
 
 struct lu_object *osc_object_alloc(const struct lu_env *env,
 };
 
 struct lu_object *osc_object_alloc(const struct lu_env *env,

-                                   const struct lu_object_header *_,
+                                   const struct lu_object_header *unused,

                                    struct lu_device *dev)
 {
         struct osc_object *osc;
                                    struct lu_device *dev)
 {
         struct osc_object *osc;

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 1f8c33c..72d0301 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -188,7 +188,7 @@ static void osc_page_transfer_add(const struct lu_env *env,
 
 static int osc_page_cache_add(const struct lu_env *env,
                               const struct cl_page_slice *slice,
 
 static int osc_page_cache_add(const struct lu_env *env,
                               const struct cl_page_slice *slice,

-                              struct cl_io *_)
+                              struct cl_io *unused)

 {
         struct osc_page   *opg = cl2osc_page(slice);
         struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj);
 {
         struct osc_page   *opg = cl2osc_page(slice);
         struct osc_object *obj = cl2osc(opg->ops_cl.cpl_obj);


@@ -229,7 +229,7 @@ void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj,
 
 static int osc_page_is_under_lock(const struct lu_env *env,
                                   const struct cl_page_slice *slice,
 
 static int osc_page_is_under_lock(const struct lu_env *env,
                                   const struct cl_page_slice *slice,

-                                  struct cl_io *_)
+                                  struct cl_io *unused)

 {
         struct cl_lock *lock;
         int             result;
 {
         struct cl_lock *lock;
         int             result;


@@ -246,7 +246,8 @@ static int osc_page_is_under_lock(const struct lu_env *env,
 }
 
 static int osc_page_fail(const struct lu_env *env,
 }
 
 static int osc_page_fail(const struct lu_env *env,

-                         const struct cl_page_slice *slice, struct cl_io *_)
+                         const struct cl_page_slice *slice,
+                         struct cl_io *unused)

 {
         /*
          * Cached read?
 {
         /*
          * Cached read?

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index 0794d1e..a580390 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -136,7 +136,7 @@ static int   osd_type_init     (struct lu_device_type *t);
 static void  osd_type_fini     (struct lu_device_type *t);
 static int   osd_object_init   (const struct lu_env *env,
                                 struct lu_object *l,
 static void  osd_type_fini     (struct lu_device_type *t);
 static int   osd_object_init   (const struct lu_env *env,
                                 struct lu_object *l,

-                                const struct lu_object_conf *_);
+                                const struct lu_object_conf *unused);

 static void  osd_object_release(const struct lu_env *env,
                                 struct lu_object *l);
 static int   osd_object_print  (const struct lu_env *env, void *cookie,
 static void  osd_object_release(const struct lu_env *env,
                                 struct lu_object *l);
 static int   osd_object_print  (const struct lu_env *env, void *cookie,


@@ -428,7 +428,7 @@ static void osd_object_init0(struct osd_object *obj)
  * life-cycle.
  */
 static int osd_object_init(const struct lu_env *env, struct lu_object *l,
  * life-cycle.
  */
 static int osd_object_init(const struct lu_env *env, struct lu_object *l,

-                           const struct lu_object_conf *_)
+                           const struct lu_object_conf *unused)

 {
         struct osd_object *obj = osd_obj(l);
         int result;
 {
         struct osd_object *obj = osd_obj(l);
         int result;