X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fllite%2Fvvp_object.c;h=20dcdf9aece72bf60d1ae1e3192aa21ac903628e;hb=f4ea7b630b8adc9856ee67c6d16549f36e14efd1;hp=48132bd11905a0c098cc9f019c7e70c135cbe2f3;hpb=ecaba99677b28536f9c376b2b835b554a7792668;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 48132bd..20dcdf9 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -126,9 +128,23 @@ int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
 {
 	struct ll_inode_info *lli = ll_i2info(conf->coc_inode);
 
-	if (conf->u.coc_md != NULL && conf->u.coc_md->lsm != NULL)
+	if (conf->coc_opc != OBJECT_CONF_SET)
+		return 0;
+
+	if (conf->u.coc_md != NULL && conf->u.coc_md->lsm != NULL) {
+		CDEBUG(D_VFSTRACE, "layout lock change: %u -> %u\n",
+			lli->lli_layout_gen,
+			conf->u.coc_md->lsm->lsm_layout_gen);
+
+		lli->lli_has_smd = true;
 		lli->lli_layout_gen = conf->u.coc_md->lsm->lsm_layout_gen;
+	} else {
+		CDEBUG(D_VFSTRACE, "layout lock destroyed: %u.\n",
+			lli->lli_layout_gen);
 
+		lli->lli_has_smd = false;
+		lli->lli_layout_gen = LL_LAYOUT_GEN_ZERO;
+	}
 	return 0;
 }