X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Flcommon_cl.c;h=94fda5a19a47d79a7f93bb117bba5b1d2a6413bd;hb=3b7d27ea22faf1c6d0a37afa724fd9b5c3240322;hp=9b5b0ed5a49f5f07a20fe0adebbaac036971f517;hpb=83ae3e2e5b9713822ea4889d832915e791801d90;p=fs%2Flustre-release.git

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index 9b5b0ed..94fda5a 100644
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -27,7 +27,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, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -64,7 +64,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 +78,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 +88,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 +114,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 +135,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 +227,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;
+	struct cl_object        *clob = lli->lli_clob;
+	__u16  refcheck;
+	int emergency;
 
-        if (clob != NULL) {
-                void                    *cookie;
-
-                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,15 +249,11 @@ 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);
-        }
+	}
 }
 
 /**