- Fixed some 64bit warnings

[fs/lustre-release.git] / lustre / include / linux / lustre_lite.h

diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h
index cacdc83..9aa7ca6 100644 (file)
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -1,17 +1,20 @@
-/* object based disk file system
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * lustre lite cluster file system
  * 
  * This code is issued under the GNU General Public License.
  * See the file COPYING in this distribution
  * 
  *
  *
- *
 
 
 
 #ifndef _LL_H
 #define _LL_H
 
+#include <linux/fs.h>
 #include <linux/ext2_fs.h>
 
 #include <linux/lustre_net.h>
@@ -22,6 +25,7 @@
 extern kmem_cache_t *ll_file_data_slab;
 struct ll_file_data { 
         __u64 fd_mdshandle; 
+        struct ptlrpc_request *fd_req; 
 };
 
 #define LL_INLINESZ      60
@@ -42,10 +46,8 @@ struct ll_sb_info {
         ino_t                     ll_rootino; /* number of root inode */
         struct ptlrpc_client      ll_mds_client;
         struct ptlrpc_connection *ll_mds_conn;
-        struct ptlrpc_client      ll_ost_client;
-        struct ptlrpc_connection *ll_ost_conn;
+        struct ldlm_namespace    *ll_namespace;
 
-        struct list_head          ll_commitcbd_not_committed;
         wait_queue_head_t         ll_commitcbd_waitq;
         wait_queue_head_t         ll_commitcbd_ctl_waitq;
         int                       ll_commitcbd_flags;
@@ -56,9 +58,19 @@ struct ll_sb_info {
 };
 
 
+static inline struct ll_sb_info *ll_s2sbi(struct super_block *sb)
+{
+        return (struct ll_sb_info *)(sb->u.generic_sbp);
+}
+
+static inline struct obd_conn *ll_s2obdconn(struct super_block *sb)
+{
+        return &(ll_s2sbi(sb))->ll_conn;
+}
+
 static inline struct ll_sb_info *ll_i2sbi(struct inode *inode)
 {
-        return (struct ll_sb_info *) (inode->i_sb->u.generic_sbp);
+        return ll_s2sbi(inode->i_sb);
 }
 
 static inline struct ll_inode_info *ll_i2info(struct inode *inode)
@@ -74,7 +86,21 @@ static inline int ll_has_inline(struct inode *inode)
 
 static inline struct obd_conn *ll_i2obdconn(struct inode *inode)
 {
-        return &(ll_i2sbi(inode))->ll_conn;
+        return ll_s2obdconn(inode->i_sb);
+}
+
+static inline void ll_ino2fid(struct ll_fid *fid, ino_t ino, __u32 generation,
+                              int type)
+{
+        fid->id = (__u64)ino;
+        fid->generation = generation;
+        fid->f_type = type;
+}
+
+static inline void ll_inode2fid(struct ll_fid *fid, struct inode *inode)
+{
+        ll_ino2fid(fid, inode->i_ino, inode->i_generation,
+                   inode->i_mode & S_IFMT);
 }
 
 /* dir.c */
@@ -99,4 +125,3 @@ void ll_sysctl_init(void);
 void ll_sysctl_clean(void);
 
 #endif
-