LU-2800 autoconf: remove obsolete autoconf options

[fs/lustre-release.git] / lustre / llite / vvp_object.c

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 7d16160..c60b22a 100644 (file)
--- 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.
@@ -28,6 +26,8 @@
 /*
  * 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));
@@ -123,13 +123,43 @@ static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
         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 = 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_EMPTY;
+       }
+       return 0;
+}
+
 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_conf_set  = vvp_conf_set,
         .coo_glimpse   = ccc_object_glimpse
 };