LU-3953 build: fix paths for generated headers

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

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 2efa270..498d3b2 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -58,24 +58,24 @@
  */
 
 static int vvp_object_print(const struct lu_env *env, void *cookie,
-                            lu_printer_t p, const struct lu_object *o)
+                           lu_printer_t p, const struct lu_object *o)
 {
-        struct ccc_object    *obj   = lu2ccc(o);
-        struct inode         *inode = obj->cob_inode;
-        struct ll_inode_info *lli;
-
-        (*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 %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));
-        }
-        return 0;
+       struct ccc_object    *obj   = lu2ccc(o);
+       struct inode         *inode = obj->cob_inode;
+       struct ll_inode_info *lli;
+
+       (*p)(env, cookie, "(%s %d %d) inode: %p ",
+            list_empty(&obj->cob_pending_list) ? "-" : "+",
+            obj->cob_transient_pages, atomic_read(&obj->cob_mmap_cnt),
+            inode);
+       if (inode) {
+               lli = ll_i2info(inode);
+               (*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));
+       }
+       return 0;
 }
 
 static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
@@ -123,8 +123,8 @@ 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)
+static 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);
 
@@ -144,26 +144,6 @@ int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
                 * a price themselves. */
                unmap_mapping_range(conf->coc_inode->i_mapping,
                                    0, OBD_OBJECT_EOF, 0);
-
-               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, DFID ": layout version change: %u -> %u\n",
-                      PFID(&lli->lli_fid), lli->lli_layout_gen,
-                      conf->u.coc_md->lsm->lsm_layout_gen);
-
-               lli->lli_has_smd = lsm_has_objects(conf->u.coc_md->lsm);
-               ll_layout_version_set(lli, conf->u.coc_md->lsm->lsm_layout_gen);
-       } else {
-               CDEBUG(D_VFSTRACE, DFID ": layout nuked: %u.\n",
-                      PFID(&lli->lli_fid), lli->lli_layout_gen);
-
-               lli->lli_has_smd = false;
-               ll_layout_version_set(lli, LL_LAYOUT_GEN_EMPTY);
        }
        return 0;
 }