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

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 21837e4..92c7763 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -64,13 +64,13 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
         struct inode         *inode = obj->cob_inode;
         struct ll_inode_info *lli;
 
-        (*p)(env, cookie, "(%s %i %i) inode: %p ",
+        (*p)(env, cookie, "(%s %d %d) inode: %p ",
              cfs_list_empty(&obj->cob_pending_list) ? "-" : "+",
              obj->cob_transient_pages, cfs_atomic_read(&obj->cob_mmap_cnt),
              inode);
         if (inode) {
                 lli = ll_i2info(inode);
-                (*p)(env, cookie, "%lu/%u %o %u %i %p "DFID,
+                (*p)(env, cookie, "%lu/%u %o %u %d %p "DFID,
                      inode->i_ino, inode->i_generation, inode->i_mode,
                      inode->i_nlink, atomic_read(&inode->i_count),
                      lli->lli_clob, PFID(&lli->lli_fid));
@@ -109,22 +109,72 @@ static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
                 inode->i_uid = attr->cat_uid;
         if (valid & CAT_GID)
                 inode->i_gid = attr->cat_gid;
+        if (valid & CAT_ATIME)
+                LTIME_S(inode->i_atime) = attr->cat_atime;
+        if (valid & CAT_MTIME)
+                LTIME_S(inode->i_mtime) = attr->cat_mtime;
+        if (valid & CAT_CTIME)
+                LTIME_S(inode->i_ctime) = attr->cat_ctime;
         if (0 && valid & CAT_SIZE)
-                i_size_write(inode, attr->cat_size);
+                cl_isize_write_nolock(inode, attr->cat_size);
         /* not currently necessary */
         if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
                 mark_inode_dirty(inode);
         return 0;
 }
 
+int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
+		const struct cl_object_conf *conf)
+{
+	struct ll_inode_info *lli = ll_i2info(conf->coc_inode);
+
+	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  = ccc_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 = {