X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_object.c;h=92c77638e14cc7510e3ef6aea03020a6a61b6a0c;hb=110d8d4952a9de607cf21f648d75e0b05ef0cee1;hp=f112744a8eb1a4b76861cbf754fbd740d95a088e;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index f112744..92c7763 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.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) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -128,20 +128,53 @@ 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_INVALIDATE) {
+		lli->lli_layout_gen = LL_LAYOUT_GEN_NONE;
+		return 0;
+	}
+
+	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 = lsm_has_objects(conf->u.coc_md->lsm);
 		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_EMPTY;
+	}
 	return 0;
 }
 
+static int vvp_prune(const struct lu_env *env, struct cl_object *obj)
+{
+	struct inode *inode = ccc_object_inode(obj);
+	int rc;
+	ENTRY;
+
+	rc = cl_sync_file_range(inode, 0, OBD_OBJECT_EOF, CL_FSYNC_ALL, 1);
+	if (rc == 0)
+		truncate_inode_pages(inode->i_mapping, 0);
+
+	RETURN(rc);
+}
+
 static const struct cl_object_operations vvp_ops = {
-        .coo_page_init = vvp_page_init,
-        .coo_lock_init = vvp_lock_init,
-        .coo_io_init   = vvp_io_init,
-        .coo_attr_get  = vvp_attr_get,
-        .coo_attr_set  = vvp_attr_set,
-        .coo_conf_set  = vvp_conf_set,
-        .coo_glimpse   = ccc_object_glimpse
+	.coo_page_init = vvp_page_init,
+	.coo_lock_init = vvp_lock_init,
+	.coo_io_init   = vvp_io_init,
+	.coo_attr_get  = vvp_attr_get,
+	.coo_attr_set  = vvp_attr_set,
+	.coo_conf_set  = vvp_conf_set,
+	.coo_prune     = vvp_prune,
+	.coo_glimpse   = ccc_object_glimpse
 };
 
 static const struct lu_object_operations vvp_lu_obj_ops = {