LU-14487 modules: remove references to Sun Trademark.

[fs/lustre-release.git] / lustre / llite / lcommon_misc.c

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index 970cbd4..70290ad 100644 (file)
--- a/lustre/llite/lcommon_misc.c
+++ b/lustre/llite/lcommon_misc.c
@@ -23,11 +23,10 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * cl code used by vvp (and other Lustre clients in the future).
  *
@@ -40,16 +39,19 @@
 
 #include "llite_internal.h"
 
-/* Initialize the default and maximum LOV EA and cookie sizes.  This allows
+/*
+ * Initialize the default and maximum LOV EA and cookie sizes.  This allows
  * us to make MDS RPCs with large enough reply buffers to hold the
  * maximum-sized (= maximum striped) EA and cookie without having to
- * calculate this (via a call into the LOV + OSCs) each time we make an RPC. */
+ * calculate this (via a call into the LOV + OSCs) each time we make an RPC.
+ */
 static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
 {
        u32 val_size;
        u32 max_easize;
        u32 def_easize;
        int rc;
+
        ENTRY;
 
        val_size = sizeof(max_easize);
@@ -64,8 +66,10 @@ static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
        if (rc != 0)
                RETURN(rc);
 
-       /* default cookiesize is 0 because from 2.4 server doesn't send
-        * llog cookies to client. */
+       /*
+        * default cookiesize is 0 because from 2.4 server doesn't send
+        * llog cookies to client.
+        */
        CDEBUG(D_HA, "updating def/max_easize: %d/%d\n",
               def_easize, max_easize);
 
@@ -81,36 +85,37 @@ static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
 int cl_ocd_update(struct obd_device *host, struct obd_device *watched,
                  enum obd_notify_event ev, void *owner)
 {
-        struct lustre_client_ocd *lco;
-        struct client_obd        *cli;
-        __u64 flags;
-        int   result;
+       struct lustre_client_ocd *lco;
+       struct client_obd *cli;
+       u64 flags;
+       int result;
+
+       ENTRY;
 
-        ENTRY;
        if (!strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME) &&
            watched->obd_set_up && !watched->obd_stopping) {
-                cli = &watched->u.cli;
-                lco = owner;
-                flags = cli->cl_import->imp_connect_data.ocd_connect_flags;
+               cli = &watched->u.cli;
+               lco = owner;
+               flags = cli->cl_import->imp_connect_data.ocd_connect_flags;
                CDEBUG(D_SUPER, "Changing connect_flags: %#llx -> %#llx\n",
-                       lco->lco_flags, flags);
+                      lco->lco_flags, flags);
                mutex_lock(&lco->lco_lock);
-                lco->lco_flags &= flags;
-                /* for each osc event update ea size */
-                if (lco->lco_dt_exp)
-                        cl_init_ea_size(lco->lco_md_exp, lco->lco_dt_exp);
+               lco->lco_flags &= flags;
+               /* for each osc event update ea size */
+               if (lco->lco_dt_exp)
+                       cl_init_ea_size(lco->lco_md_exp, lco->lco_dt_exp);
 
                mutex_unlock(&lco->lco_lock);
-                result = 0;
-        } else {
+               result = 0;
+       } else {
                CERROR("unexpected notification from %s %s"
                       "(setup:%d,stopping:%d)!\n",
                       watched->obd_type->typ_name,
                       watched->obd_name, watched->obd_set_up,
                       watched->obd_stopping);
                result = -EINVAL;
-        }
-        RETURN(result);
+       }
+       RETURN(result);
 }
 
 #define GROUPLOCK_SCOPE "grouplock"
@@ -118,20 +123,20 @@ int cl_ocd_update(struct obd_device *host, struct obd_device *watched,
 int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                     struct ll_grouplock *lg)
 {
-        struct lu_env          *env;
-        struct cl_io           *io;
-        struct cl_lock         *lock;
-        struct cl_lock_descr   *descr;
-        __u32                   enqflags;
-       __u16                   refcheck;
-        int                     rc;
-
-        env = cl_env_get(&refcheck);
-        if (IS_ERR(env))
-                return PTR_ERR(env);
+       struct lu_env *env;
+       struct cl_io *io;
+       struct cl_lock *lock;
+       struct cl_lock_descr *descr;
+       u32 enqflags;
+       u16 refcheck;
+       int rc;
+
+       env = cl_env_get(&refcheck);
+       if (IS_ERR(env))
+               return PTR_ERR(env);
 
        io = vvp_env_thread_io(env);
-        io->ci_obj = obj;
+       io->ci_obj = obj;
 
        rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);
        if (rc != 0) {
@@ -145,11 +150,11 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
 
        lock = vvp_env_lock(env);
        descr = &lock->cll_descr;
-        descr->cld_obj = obj;
-        descr->cld_start = 0;
-        descr->cld_end = CL_PAGE_EOF;
-        descr->cld_gid = gid;
-        descr->cld_mode = CLM_GROUP;
+       descr->cld_obj = obj;
+       descr->cld_start = 0;
+       descr->cld_end = CL_PAGE_EOF;
+       descr->cld_gid = gid;
+       descr->cld_mode = CLM_GROUP;
 
        enqflags = CEF_MUST | (nonblock ? CEF_NONBLOCK : 0);
        descr->cld_enq_flags = enqflags;