b=21527 Portability fixes

[fs/lustre-release.git] / lustre / liblustre / llite_cl.c

diff --git a/lustre/liblustre/llite_cl.c b/lustre/liblustre/llite_cl.c
index e37edbe..12723d4 100644 (file)
--- a/lustre/liblustre/llite_cl.c
+++ b/lustre/liblustre/llite_cl.c
@@ -487,6 +487,7 @@ static void llu_free_user_page(struct page *page)
         OBD_FREE_PTR(page);
 }
 
+
 static int llu_queue_pio(const struct lu_env *env, struct cl_io *io,
                          struct llu_io_group *group,
                          char *buf, size_t count, loff_t pos)
@@ -609,6 +610,14 @@ void put_io_group(struct llu_io_group *group)
         OBD_FREE_PTR(group);
 }
 
+/**
+ * True, if \a io is a normal io, False for sendfile() / splice_{read|write}
+ */
+int cl_is_normalio(const struct lu_env *env, const struct cl_io *io)
+{
+        return 1;
+}
+
 static int slp_io_start(const struct lu_env *env, const struct cl_io_slice *ios)
 {
         struct ccc_io     *cio   = cl2ccc_io(env, ios);
@@ -652,7 +661,7 @@ static int slp_io_start(const struct lu_env *env, const struct cl_io_slice *ios)
                 GOTO(out, err);
 
         CDEBUG(D_INODE,
-               "%s ino %lu, %lu bytes, offset %lld, i_size %llu\n",
+               "%s ino %lu, %lu bytes, offset "LPU64", i_size "LPU64"\n",
                write ? "Write" : "Read", (unsigned long)st->st_ino,
                cnt, (__u64)pos, (__u64)st->st_size);