- elimininate the system calls from filter obd

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

diff --git a/lustre/include/linux/lustre_light.h b/lustre/include/linux/lustre_light.h
index fe95c0f..b72bd7d 100644 (file)
--- a/lustre/include/linux/lustre_light.h
+++ b/lustre/include/linux/lustre_light.h
@@ -14,13 +14,15 @@
 #include <linux/obd_class.h>
 #include <linux/obdo.h>
 #include <linux/list.h>
+#include <linux/lustre_net.h>
 
 #define LL_SUPER_MAGIC 0x0BD00BD0;
 
+#define LL_INLINESZ      60
 struct ll_inode_info {
         int              lli_flags;
        __u64            lli_objid; 
-        char             lli_inline[OBD_INLINESZ];
+        char             lli_inline[LL_INLINESZ];
 };
 
 struct ll_sb_info {
@@ -34,6 +36,8 @@ struct ll_sb_info {
         struct list_head         ll_inodes;    /* list of dirty inodes */
         unsigned long            ll_cache_count;
         struct semaphore         ll_list_mutex;
+       struct lustre_peer       ll_peer;
+       struct lustre_peer      *ll_peer_ptr;
 };
 
 
@@ -47,26 +51,6 @@ static inline int ll_has_inline(struct inode *inode)
         return (ll_i2info(inode)->lli_flags & OBD_FL_INLINEDATA);
 }
 
-static void inline ll_from_inode(struct obdo *oa, struct inode *inode)
-{
-        struct ll_inode_info *oinfo = ll_i2info(inode);
-
-        CDEBUG(D_INFO, "src inode %ld, dst obdo %ld valid 0x%08x\n",
-               inode->i_ino, (long)oa->o_id, oa->o_valid);
-        obdo_from_inode(oa, inode);
-       if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
-                CDEBUG(D_INODE, "copying device %x from inode to obdo\n",
-                      inode->i_rdev);
-               *((obd_rdev *)oa->o_inline) = kdev_t_to_nr(inode->i_rdev);
-                oa->o_obdflags |= OBD_FL_INLINEDATA;
-                oa->o_valid |= OBD_MD_FLINLINE;
-       } else if (ll_has_inline(inode)) {
-                CDEBUG(D_INODE, "copying inline data from inode to obdo\n");
-                memcpy(oa->o_inline, oinfo->lli_inline, OBD_INLINESZ);
-                oa->o_obdflags |= OBD_FL_INLINEDATA;
-                oa->o_valid |= OBD_MD_FLINLINE;
-        }
-} /* ll_from_inode */
 
 
 
@@ -187,39 +171,5 @@ static inline struct list_head *ll_slist(struct inode *inode)
         return &sbi->ll_inodes;
 }
 
-static void inline ll_set_size (struct inode *inode, obd_size size)
-{  
-       inode->i_size = size;
-       inode->i_blocks = (inode->i_size + inode->i_sb->s_blocksize - 1) >>
-               inode->i_sb->s_blocksize_bits;
-} /* ll_set_size */
-
-
-
-#define obd_down(mutex) {                                               \
-        /* CDEBUG(D_INFO, "get lock\n"); */                             \
-        ll_mutex_start = jiffies;                                    \
-        down(mutex);                                                    \
-        if (jiffies - ll_mutex_start)                                \
-                CDEBUG(D_CACHE, "waited on mutex %ld jiffies\n",        \
-                       jiffies - ll_mutex_start);                    \
-}
-
-#define obd_up(mutex) {                                                 \
-        up(mutex);                                                      \
-        if (jiffies - ll_mutex_start > 1)                            \
-                CDEBUG(D_CACHE, "held mutex for %ld jiffies\n",         \
-                       jiffies - ll_mutex_start);                    \
-        /* CDEBUG(D_INFO, "free lock\n"); */                            \
-}
-
-/* We track if a page has been added to the OBD page cache by stting a
- * flag on the page.  We have chosen a bit that will hopefully not be
- * used for a while.
- */
-#define PG_obdcache 29
-#define OBDAddCachePage(page)   test_and_set_bit(PG_obdcache, &(page)->flags)
-#define OBDClearCachePage(page) clear_bit(PG_obdcache, &(page)->flags)
-
 #endif