Whamcloud - gitweb
land b1_5 onto HEAD
[fs/lustre-release.git] / lustre / include / linux / lustre_lite.h
index 8f8c3b0..9e09a06 100644 (file)
@@ -1,18 +1,13 @@
 /* -*- 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
- *
- * Copyright (C) 2002 Cluster File Systems, Inc. <info@clusterfs.com>
  */
 
-
+#ifndef _LINUX_LL_H
+#define _LINUX_LL_H
 
 #ifndef _LL_H
-#define _LL_H
+#error Do not #include this file directly. #include <lustre_lite.h> instead
+#endif
 
 #ifdef __KERNEL__
 
 
 #include <linux/fs.h>
 #include <linux/dcache.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/proc_fs.h>
 
-#include <linux/obd_class.h>
-#include <linux/lustre_net.h>
-#include <linux/lustre_mds.h>
-#include <linux/lustre_ha.h>
+#include <obd_class.h>
+#include <lustre_net.h>
+#include <lustre_mds.h>
+#include <lustre_ha.h>
 
 #include <linux/rbtree.h>
 #include <linux/lustre_compat25.h>
 #include <linux/pagemap.h>
-#include <linux/namei.h>
-
-
-/* forward declarations */
-struct remote_acl;
-
-/* careful, this is easy to screw up */
-#define PAGE_CACHE_MAXBYTES ((__u64)(~0UL) << PAGE_CACHE_SHIFT)
-
-#define LL_IT2STR(it) ((it) ? ldlm_it2str((it)->it_op) : "0")
-
-static inline struct lookup_intent *ll_nd2it(struct nameidata *nd)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-        return &nd->intent.open;
-#else
-        return nd->intent;
-#endif
-}
-
-struct ll_dentry_data {
-        int                      lld_cwd_count;
-        int                      lld_mnt_count;
-        struct obd_client_handle lld_cwd_och;
-        struct obd_client_handle lld_mnt_och;
-};
-
-#define ll_d2d(de) ((struct ll_dentry_data*) de->d_fsdata)
-
-extern struct file_operations ll_pgcache_seq_fops;
-
-#define LLI_INODE_MAGIC                 0x111d0de5
-#define LLI_INODE_DEAD                  0xdeadd00d
-#define LLI_F_HAVE_OST_SIZE_LOCK        0
-#define LLI_F_HAVE_MDS_SIZE_LOCK        1
-#define LLI_F_PREFER_EXTENDED_SIZE      2
-#define LLI_F_DIRTY_HANDLE              3
-                                                   
-struct ll_inode_info {
-        int                     lli_size_pid;
-        int                     lli_inode_magic;
-        struct lov_stripe_md   *lli_smd;
-        struct mea             *lli_mea;
-        struct lustre_id        lli_id;    /* full lustre_id */
-        char                   *lli_symlink_name;
-        struct semaphore        lli_open_sem;
-        struct semaphore        lli_size_sem;
-        __u64                   lli_maxbytes;
-        __u64                   lli_io_epoch;
-        __u64                   lli_audit_mask;
-        unsigned long           lli_flags;
-
-        /* this lock protects s_d_w and p_w_ll */
-        spinlock_t              lli_lock;
-        int                     lli_send_done_writing;
-        
-        int                     lli_snap_index;
-        
-        struct list_head        lli_pending_write_llaps;
-
-        struct list_head        lli_close_item;
-
-        struct file_operations *ll_save_ifop;
-        struct file_operations *ll_save_ffop;
-        struct file_operations *ll_save_wfop;
-        struct file_operations *ll_save_wrfop;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-        struct inode            lli_vfs_inode;
-#endif
-        struct semaphore        lli_och_sem; /* Protects access to och pointers
-                                                and their usage counters */
-        /* We need all three because every inode may be opened in different
-           modes */
-        struct obd_client_handle *lli_mds_read_och;
-        __u64                   lli_open_fd_read_count;
-        struct obd_client_handle *lli_mds_write_och;
-        __u64                   lli_open_fd_write_count;
-        struct obd_client_handle *lli_mds_exec_och;
-        __u64                   lli_open_fd_exec_count;
-        struct posix_acl       *lli_posix_acl;
-        struct remote_acl      *lli_remote_acl;
-
-        struct lustre_key      *lli_key_info;
-
-        struct list_head        lli_capas;
-
-        wait_queue_head_t       lli_dirty_wait;
-};
-
-// FIXME: replace the name of this with LL_I to conform to kernel stuff
-// static inline struct ll_inode_info *LL_I(struct inode *inode)
-static inline struct ll_inode_info *ll_i2info(struct inode *inode)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-        return container_of(inode, struct ll_inode_info, lli_vfs_inode);
-#else
-        return (struct ll_inode_info *)&(inode->u.generic_ip);
-#endif
-}
-
-#define LLI_HAVE_FLSIZE(inode)  \
-        test_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &ll_i2info(inode)->lli_flags)
-#define LLI_DIRTY_HANDLE(inode)  \
-        test_bit(LLI_F_DIRTY_HANDLE, &ll_i2info(inode)->lli_flags)
 
 /* lprocfs.c */
 enum {
@@ -169,35 +58,16 @@ enum {
 #endif
          LPROC_LL_STAFS,
          LPROC_LL_ALLOC_INODE,
-
-         LPROC_LL_DIRECT_READ,
-         LPROC_LL_DIRECT_WRITE,
          LPROC_LL_SETXATTR,
          LPROC_LL_GETXATTR,
-         LPROC_LL_FILE_OPCODES,
-};
 
-struct lustre_intent_data {
-        int     it_disposition;
-        int     it_status;
-        __u64   it_lock_handle;
-        void    *it_data;
-        int     it_lock_mode;
-        int     it_int_flags;
-        void    *it_key;
-        int     it_key_size;
+         LPROC_LL_DIRECT_READ,
+         LPROC_LL_DIRECT_WRITE,
+         LPROC_LL_FILE_OPCODES
 };
-#define LUSTRE_IT(it) ((struct lustre_intent_data *)((it)->d.fs_data))
 
 #else
-#include <linux/lustre_idl.h>
+#include <lustre/lustre_idl.h>
 #endif /* __KERNEL__ */
 
-#define LLAP_FROM_COOKIE(c)                                                    \
-        (LASSERT(((struct ll_async_page *)(c))->llap_magic == LLAP_MAGIC),     \
-         (struct ll_async_page *)(c))
-
-#include <lustre/lustre_user.h>
-#include <linux/lustre_sec.h>
-
 #endif