LU-9930 llite: only clear lli_sai if the setter

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

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 9b5b0ed..93deb63 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.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, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,7 +47,6 @@
 #include <obd_support.h>
 #include <lustre_fid.h>
 #include <lustre_dlm.h>
-#include <lustre_ver.h>
 #include <lustre_mdc.h>
 #include <cl_object.h>
 
@@ -64,7 +59,7 @@
  * mutex.
  */
 struct lu_env *cl_inode_fini_env;
-int cl_inode_fini_refcheck;
+__u16 cl_inode_fini_refcheck;
 
 /**
  * A mutex serializing calls to slp_inode_fini() under extreme memory
@@ -78,7 +73,7 @@ int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
         struct lu_env *env;
         struct cl_io  *io;
         int            result;
-        int            refcheck;
+       __u16          refcheck;
 
         ENTRY;
 
@@ -88,6 +83,7 @@ int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
 
        io = vvp_env_thread_io(env);
        io->ci_obj = obj;
+       io->ci_verify_layout = 1;
 
        io->u.ci_setattr.sa_attr.lvb_atime = LTIME_S(attr->ia_atime);
        io->u.ci_setattr.sa_attr.lvb_mtime = LTIME_S(attr->ia_mtime);
@@ -113,12 +109,7 @@ again:
         cl_io_fini(env, io);
        if (unlikely(io->ci_need_restart))
                goto again;
-       /* HSM import case: file is released, cannot be restored
-        * no need to fail except if restore registration failed
-        * with -ENODATA */
-       if (result == -ENODATA && io->ci_restore_needed &&
-           io->ci_result != -ENODATA)
-               result = 0;
+
        cl_env_put(env, &refcheck);
        RETURN(result);
 }
@@ -139,14 +130,14 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
         struct cl_object     *clob;
         struct lu_site       *site;
         struct lu_fid        *fid;
-        struct cl_object_conf conf = {
-                .coc_inode = inode,
-                .u = {
-                        .coc_md    = md
-                }
-        };
+       struct cl_object_conf conf = {
+               .coc_inode = inode,
+               .u = {
+                       .coc_layout = md->layout,
+               }
+       };
         int result = 0;
-        int refcheck;
+       __u16 refcheck;
 
        LASSERT(md->body->mbo_valid & OBD_MD_FLID);
        LASSERT(S_ISREG(inode->i_mode));
@@ -231,20 +222,16 @@ void cl_inode_fini(struct inode *inode)
 {
        struct lu_env           *env;
        struct ll_inode_info    *lli  = ll_i2info(inode);
-        struct cl_object        *clob = lli->lli_clob;
-        int refcheck;
-        int emergency;
-
-        if (clob != NULL) {
-                void                    *cookie;
+       struct cl_object        *clob = lli->lli_clob;
+       __u16  refcheck;
+       int emergency;
 
-                cookie = cl_env_reenter();
-                env = cl_env_get(&refcheck);
-                emergency = IS_ERR(env);
+       if (clob != NULL) {
+               env = cl_env_get(&refcheck);
+               emergency = IS_ERR(env);
                if (emergency) {
                        mutex_lock(&cl_inode_fini_guard);
                        LASSERT(cl_inode_fini_env != NULL);
-                       cl_env_implant(cl_inode_fini_env, &refcheck);
                        env = cl_inode_fini_env;
                }
 
@@ -257,40 +244,36 @@ void cl_inode_fini(struct inode *inode)
                 lu_object_ref_del(&clob->co_lu, "inode", inode);
                 cl_object_put_last(env, clob);
                 lli->lli_clob = NULL;
-               if (emergency) {
-                       cl_env_unplant(cl_inode_fini_env, &refcheck);
+               if (emergency)
                        mutex_unlock(&cl_inode_fini_guard);
-               } else {
+               else
                        cl_env_put(env, &refcheck);
-               }
-
-                cl_env_reexit(cookie);
-        }
+       }
 }
 
 /**
- * build inode number from passed @fid */
+ * build inode number from passed @fid.
+ *
+ * For 32-bit systems or syscalls limit the inode number to a 32-bit value
+ * to avoid EOVERFLOW errors.  This will inevitably result in inode number
+ * collisions, but fid_flatten32() tries hard to avoid this if possible.
+ */
 __u64 cl_fid_build_ino(const struct lu_fid *fid, int api32)
 {
-        if (BITS_PER_LONG == 32 || api32)
-                RETURN(fid_flatten32(fid));
-        else
-                RETURN(fid_flatten(fid));
+       if (BITS_PER_LONG == 32 || api32)
+               RETURN(fid_flatten32(fid));
+
+       RETURN(fid_flatten(fid));
 }
 
 /**
  * build inode generation from passed @fid.  If our FID overflows the 32-bit
- * inode number then return a non-zero generation to distinguish them. */
+ * inode number then return a non-zero generation to distinguish them.
+ */
 __u32 cl_fid_build_gen(const struct lu_fid *fid)
 {
-        __u32 gen;
-        ENTRY;
-
-        if (fid_is_igif(fid)) {
-                gen = lu_igif_gen(fid);
-                RETURN(gen);
-        }
+       if (fid_is_igif(fid))
+               RETURN(lu_igif_gen(fid));
 
-        gen = (fid_flatten(fid) >> 32);
-        RETURN(gen);
+       RETURN(fid_flatten(fid) >> 32);
 }