X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fnamei.c;h=eb5b5f9b57750baaf9c206af44ee853d38a55742;hb=478f97b212714bc3af9a9a104efab314ca942758;hp=901b213f17a79553b97039dd6da9ee1214144bb9;hpb=2dadefb4148f753dd93ee1dbebb3aac49bda2f8d;p=fs%2Flustre-release.git

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 901b213..eb5b5f9 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -230,6 +230,7 @@ int ll_dom_lock_cancel(struct inode *inode, struct ldlm_lock *lock)
 void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
 {
 	struct inode *inode = ll_inode_from_resource_lock(lock);
+	struct ll_inode_info *lli;
 	__u64 bits = to_cancel;
 	int rc;
 
@@ -256,8 +257,6 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
 	}
 
 	if (bits & MDS_INODELOCK_XATTR) {
-		if (S_ISDIR(inode->i_mode))
-			ll_i2info(inode)->lli_def_stripe_offset = -1;
 		ll_xattr_cache_destroy(inode);
 		bits &= ~MDS_INODELOCK_XATTR;
 	}
@@ -319,15 +318,12 @@ void ll_lock_cancel_bits(struct ldlm_lock *lock, __u64 to_cancel)
 			       PFID(ll_inode2fid(inode)), rc);
 	}
 
-	if (bits & MDS_INODELOCK_UPDATE) {
-		struct ll_inode_info *lli = ll_i2info(inode);
+	lli = ll_i2info(inode);
 
+	if (bits & MDS_INODELOCK_UPDATE)
 		lli->lli_update_atime = 1;
-	}
 
 	if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
-		struct ll_inode_info *lli = ll_i2info(inode);
-
 		CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, "
 		       "pfid  = "DFID"\n", PFID(ll_inode2fid(inode)),
 		       lli, PFID(&lli->lli_pfid));
@@ -704,7 +700,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request,
 		struct lu_fid	fid = ll_i2info(parent)->lli_fid;
 
 		/* If it is striped directory, get the real stripe parent */
-		if (unlikely(ll_i2info(parent)->lli_lsm_md != NULL)) {
+		if (unlikely(ll_dir_striped(parent))) {
 			rc = md_get_fid_from_lsm(ll_i2mdexp(parent),
 						 ll_i2info(parent)->lli_lsm_md,
 						 (*de)->d_name.name,
@@ -1337,13 +1333,11 @@ again:
 			from_kuid(&init_user_ns, current_fsuid()),
 			from_kgid(&init_user_ns, current_fsgid()),
 			cfs_curproc_cap_pack(), rdev, &request);
-	if (err < 0 && err != -EREMOTE)
-		GOTO(err_exit, err);
-
-	/* If the client doesn't know where to create a subdirectory (or
-	 * in case of a race that sends the RPC to the wrong MDS), the
-	 * MDS will return -EREMOTE and the client will fetch the layout
-	 * of the directory, then create the directory on the right MDT. */
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 58, 0)
+	/*
+	 * server < 2.12.58 doesn't pack default LMV in intent_getattr reply,
+	 * fetch default LMV here.
+	 */
 	if (unlikely(err == -EREMOTE)) {
 		struct ll_inode_info	*lli = ll_i2info(dir);
 		struct lmv_user_md	*lum;
@@ -1355,24 +1349,54 @@ again:
 
 		err2 = ll_dir_getstripe(dir, (void **)&lum, &lumsize, &request,
 					OBD_MD_DEFAULT_MEA);
+		ll_finish_md_op_data(op_data);
+		op_data = NULL;
 		if (err2 == 0) {
-			/* Update stripe_offset and retry */
-			lli->lli_def_stripe_offset = lum->lum_stripe_offset;
-		} else if (err2 == -ENODATA &&
-			   lli->lli_def_stripe_offset != -1) {
-			/* If there are no default stripe EA on the MDT, but the
+			struct lustre_md md = { NULL };
+
+			md.body = req_capsule_server_get(&request->rq_pill,
+							 &RMF_MDT_BODY);
+			if (!md.body)
+				GOTO(err_exit, err = -EPROTO);
+
+			OBD_ALLOC_PTR(md.default_lmv);
+			if (!md.default_lmv)
+				GOTO(err_exit, err = -ENOMEM);
+
+			md.default_lmv->lsm_md_magic = lum->lum_magic;
+			md.default_lmv->lsm_md_stripe_count =
+				lum->lum_stripe_count;
+			md.default_lmv->lsm_md_master_mdt_index =
+				lum->lum_stripe_offset;
+			md.default_lmv->lsm_md_hash_type = lum->lum_hash_type;
+
+			err = ll_update_inode(dir, &md);
+			md_free_lustre_md(sbi->ll_md_exp, &md);
+			if (err)
+				GOTO(err_exit, err);
+		} else if (err2 == -ENODATA && lli->lli_default_lsm_md) {
+			/*
+			 * If there are no default stripe EA on the MDT, but the
 			 * client has default stripe, then it probably means
-			 * default stripe EA has just been deleted. */
-			lli->lli_def_stripe_offset = -1;
+			 * default stripe EA has just been deleted.
+			 */
+			down_write(&lli->lli_lsm_sem);
+			if (lli->lli_default_lsm_md)
+				OBD_FREE_PTR(lli->lli_default_lsm_md);
+			lli->lli_default_lsm_md = NULL;
+			up_write(&lli->lli_lsm_sem);
 		} else {
 			GOTO(err_exit, err);
 		}
 
 		ptlrpc_req_finished(request);
 		request = NULL;
-		ll_finish_md_op_data(op_data);
 		goto again;
 	}
+#endif
+
+	if (err < 0)
+		GOTO(err_exit, err);
 
 	ll_update_times(request, dir);