LU-1154 clio: rename coo_attr_set to coo_attr_update

[fs/lustre-release.git] / lustre / osc / osc_request.c

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index b71705e..a0d19d5 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -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;
@@ -1716,7 +1716,7 @@ static int brw_interpret(const struct lu_env *env,
                }
 
                if (valid != 0)
-                       cl_object_attr_set(env, obj, attr, valid);
+                       cl_object_attr_update(env, obj, attr, valid);
                cl_object_attr_unlock(obj);
        }
        OBDO_FREE(aa->aa_oa);
@@ -2943,7 +2943,7 @@ int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
        cli->cl_grant_shrink_interval = GRANT_SHRINK_INTERVAL;
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
        obd->obd_vars = lprocfs_osc_obd_vars;
 #endif
        /* If this is true then both client (osc) and server (osp) are on the
@@ -2952,9 +2952,9 @@ int osc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         * tree to type->typ_procsym instead of obd->obd_type->typ_procroot. */
        type = class_search_type(LUSTRE_OSP_NAME);
        if (type && type->typ_procsym) {
-               obd->obd_proc_entry = lprocfs_seq_register(obd->obd_name,
-                                                          type->typ_procsym,
-                                                          obd->obd_vars, obd);
+               obd->obd_proc_entry = lprocfs_register(obd->obd_name,
+                                                      type->typ_procsym,
+                                                      obd->obd_vars, obd);
                if (IS_ERR(obd->obd_proc_entry)) {
                        rc = PTR_ERR(obd->obd_proc_entry);
                        CERROR("error %d setting up lprocfs for %s\n", rc,
@@ -3082,12 +3082,12 @@ int osc_process_config_base(struct obd_device *obd, struct lustre_cfg *lcfg)
        return rc > 0 ? 0: rc;
 }
 
-static int osc_process_config(struct obd_device *obd, obd_count len, void *buf)
+static int osc_process_config(struct obd_device *obd, size_t len, void *buf)
 {
         return osc_process_config_base(obd, buf);
 }
 
-struct obd_ops osc_obd_ops = {
+static struct obd_ops osc_obd_ops = {
         .o_owner                = THIS_MODULE,
         .o_setup                = osc_setup,
         .o_precleanup           = osc_precleanup,
@@ -3116,10 +3116,7 @@ struct obd_ops osc_obd_ops = {
         .o_quotacheck           = osc_quotacheck,
 };
 
-extern struct lu_kmem_descr osc_caches[];
-extern struct lock_class_key osc_ast_guard_class;
-
-int __init osc_init(void)
+static int __init osc_init(void)
 {
        bool enable_proc = true;
        struct obd_type *type;