LU-8735 llite: Return -ERESTARTSYS in range_lock()

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

diff --git a/lustre/llite/lcommon_misc.c b/lustre/llite/lcommon_misc.c
index 80ce42e..4f35793 100644 (file)
--- a/lustre/llite/lcommon_misc.c
+++ b/lustre/llite/lcommon_misc.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,6 +33,7 @@
  * future).
  *
  */
+#define DEBUG_SUBSYSTEM S_LLITE
 #include <obd_class.h>
 #include <obd_support.h>
 #include <obd.h>
@@ -98,7 +95,7 @@ int cl_ocd_update(struct obd_device *host,
                 cli = &watched->u.cli;
                 lco = owner;
                 flags = cli->cl_import->imp_connect_data.ocd_connect_flags;
-                CDEBUG(D_SUPER, "Changing connect_flags: "LPX64" -> "LPX64"\n",
+               CDEBUG(D_SUPER, "Changing connect_flags: %#llx -> %#llx\n",
                        lco->lco_flags, flags);
                mutex_lock(&lco->lco_lock);
                 lco->lco_flags &= flags;
@@ -138,7 +135,6 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
 
        io = vvp_env_thread_io(env);
         io->ci_obj = obj;
-       io->ci_ignore_layout = 1;
 
        rc = cl_io_init(env, io, CIT_MISC, io->ci_obj);
        if (rc != 0) {
@@ -168,13 +164,11 @@ int cl_get_grouplock(struct cl_object *obj, unsigned long gid, int nonblock,
                return rc;
        }
 
-       lg->lg_env = cl_env_get(&refcheck);
+       lg->lg_env = env;
        lg->lg_io = io;
        lg->lg_lock = lock;
        lg->lg_gid = gid;
-       LASSERT(lg->lg_env == env);
 
-       cl_env_unplant(env, &refcheck);
        return 0;
 }
 
@@ -183,14 +177,10 @@ void cl_put_grouplock(struct ll_grouplock *lg)
        struct lu_env  *env  = lg->lg_env;
        struct cl_io   *io   = lg->lg_io;
        struct cl_lock *lock = lg->lg_lock;
-       __u16             refcheck;
 
        LASSERT(lg->lg_env != NULL);
        LASSERT(lg->lg_gid != 0);
 
-       cl_env_implant(env, &refcheck);
-       cl_env_put(env, &refcheck);
-
        cl_lock_release(env, lock);
        cl_io_fini(env, io);
        cl_env_put(env, NULL);