LU-6540 test: fix no %s specifier for the file

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

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index f1a97f7..e7e4480 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -40,7 +40,10 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <libcfs/libcfs.h>
 
 #include <obd.h>
@@ -69,8 +72,7 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
        struct inode         *inode = obj->vob_inode;
        struct ll_inode_info *lli;
 
-       (*p)(env, cookie, "(%s %d %d) inode: %p ",
-            list_empty(&obj->vob_pending_list) ? "-" : "+",
+       (*p)(env, cookie, "(%d %d) inode: %p ",
             atomic_read(&obj->vob_transient_pages),
             atomic_read(&obj->vob_mmap_cnt),
             inode);
@@ -106,8 +108,8 @@ static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
        return 0; /* layers below have to fill in the rest */
 }
 
-static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
-                        const struct cl_attr *attr, unsigned valid)
+static int vvp_attr_update(const struct lu_env *env, struct cl_object *obj,
+                          const struct cl_attr *attr, unsigned valid)
 {
        struct inode *inode = vvp_object_inode(obj);
 
@@ -138,7 +140,7 @@ static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
                CDEBUG(D_VFSTRACE, DFID ": losing layout lock\n",
                       PFID(&lli->lli_fid));
 
-               ll_layout_version_set(lli, LL_LAYOUT_GEN_NONE);
+               ll_layout_version_set(lli, CL_LAYOUT_GEN_NONE);
 
                /* Clean up page mmap for this inode.
                 * The reason for us to do this is that if the page has
@@ -193,14 +195,14 @@ static int vvp_object_glimpse(const struct lu_env *env,
 }
 
 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_prune     = vvp_prune,
-       .coo_glimpse   = vvp_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_update  = vvp_attr_update,
+       .coo_conf_set     = vvp_conf_set,
+       .coo_prune        = vvp_prune,
+       .coo_glimpse      = vvp_object_glimpse
 };
 
 static int vvp_object_init0(const struct lu_env *env,
@@ -209,7 +211,7 @@ static int vvp_object_init0(const struct lu_env *env,
 {
        vob->vob_inode = conf->coc_inode;
        atomic_set(&vob->vob_transient_pages, 0);
-       cl_object_page_init(&vob->vob_cl, sizeof(struct ccc_page));
+       cl_object_page_init(&vob->vob_cl, sizeof(struct vvp_page));
        return 0;
 }
 
@@ -228,7 +230,6 @@ static int vvp_object_init(const struct lu_env *env, struct lu_object *obj,
                const struct cl_object_conf *cconf;
 
                cconf = lu2cl_conf(conf);
-               INIT_LIST_HEAD(&vob->vob_pending_list);
                lu_object_add(obj, below);
                result = vvp_object_init0(env, vob, cconf);
        } else