Update b_orphan from HEAD (20040130_1601) in preparation for landing.

diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c
index 0adc60d..81467da 100644 (file)
--- a/lustre/llite/rw24.c
+++ b/lustre/llite/rw24.c
@@ -131,9 +131,18 @@ out:
         RETURN(rc);
 }
 
-static int ll_direct_IO_24(int rw, struct inode *inode, struct kiobuf *iobuf,
-                           unsigned long blocknr, int blocksize)
+static int ll_direct_IO_24(int rw,
+#ifdef HAVE_DIO_FILE
+                           struct file *file,
+#else
+                           struct inode *inode,
+#endif
+                           struct kiobuf *iobuf, unsigned long blocknr,
+                           int blocksize)
 {
+#ifdef HAVE_DIO_FILE
+        struct inode *inode = file->f_dentry->d_inode;
+#endif
         struct ll_inode_info *lli = ll_i2info(inode);
         struct lov_stripe_md *lsm = lli->lli_smd;
         struct brw_page *pga;

diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index b0d8d74..4d9e68c 100644 (file)
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -337,12 +337,11 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len,
                                 uncanceled++;
                 }
 
-                l = snprintf(out, remains, "[Log Name]: %s\nLog Size: "LPD64"\n"
+                l = snprintf(out, remains, "[Log Name]: %s\nLog Size: %llu\n"
                              "Last Index: %d\nUncanceled Records: %d\n\n",
                              name[i],
                              handle->lgh_file->f_dentry->d_inode->i_size,
-                             handle->lgh_last_idx,
-                             uncanceled);
+                             handle->lgh_last_idx, uncanceled);
                 out += l;
                 remains -= l;
 
@@ -399,7 +398,7 @@ static int llog_catinfo_cb(struct llog_handle *cat,
         }
 
         l = snprintf(out, remains, "\t[Log ID]: #"LPX64"#"LPX64"#%08x\n"
-                     "\tLog Size: "LPD64"\n\tLast Index: %d\n"
+                     "\tLog Size: %llu\n\tLast Index: %d\n"
                      "\tUncanceled Records: %d\n",
                      logid->lgl_oid, logid->lgl_ogr, logid->lgl_ogen,
                      handle->lgh_file->f_dentry->d_inode->i_size,