LU-5971 llite: merge lclient.h into llite/vvp_internal.h

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

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 53c5f12..b653570 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -44,6 +44,7 @@
 #include <libcfs/libcfs.h>
 
 #include <obd.h>
+#include "llite_internal.h"
 #include "vvp_internal.h"
 
 /*****************************************************************************
@@ -61,7 +62,8 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
 
        (*p)(env, cookie, "(%s %d %d) inode: %p ",
             list_empty(&obj->cob_pending_list) ? "-" : "+",
-            obj->cob_transient_pages, atomic_read(&obj->cob_mmap_cnt),
+            atomic_read(&obj->cob_transient_pages),
+            atomic_read(&obj->cob_mmap_cnt),
             inode);
        if (inode) {
                lli = ll_i2info(inode);
@@ -149,11 +151,15 @@ static int vvp_prune(const struct lu_env *env, struct cl_object *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);
+       rc = cl_sync_file_range(inode, 0, OBD_OBJECT_EOF, CL_FSYNC_LOCAL, 1);
+       if (rc < 0) {
+               CDEBUG(D_VFSTRACE, DFID ": writeback failed: %d\n",
+                      PFID(lu_object_fid(&obj->co_lu)), rc);
+               RETURN(rc);
+       }
 
-       RETURN(rc);
+       truncate_inode_pages(inode->i_mapping, 0);
+       RETURN(0);
 }
 
 static const struct cl_object_operations vvp_ops = {