LU-4603 lmv: a few fixes about readdir of striped dir.

[fs/lustre-release.git] / lustre / include / lclient.h

diff --git a/lustre/include/lclient.h b/lustre/include/lclient.h
index 5285071..4f42eea 100644 (file)
--- a/lustre/include/lclient.h
+++ b/lustre/include/lclient.h
@@ -43,6 +43,18 @@
 #ifndef LCLIENT_H
 #define LCLIENT_H
 
+#include <lustre/lustre_idl.h>
+#include <cl_object.h>
+
+enum obd_notify_event;
+struct inode;
+struct lov_stripe_md;
+struct lustre_md;
+struct obd_capa;
+struct obd_device;
+struct obd_export;
+struct page;
+
 blkcnt_t dirty_cnt(struct inode *inode);
 
 int cl_glimpse_size0(struct inode *inode, int agl);
@@ -101,11 +113,17 @@ struct ccc_io {
                 struct {
                         enum ccc_setattr_lock_type cui_local_lock;
                 } setattr;
-        } u;
-        /**
-         * True iff io is processing glimpse right now.
-         */
-        int                  cui_glimpse;
+               struct {
+                       struct cl_page_list cui_queue;
+                       unsigned long cui_written;
+                       int cui_from;
+                       int cui_to;
+               } write;
+       } u;
+       /**
+        * True iff io is processing glimpse right now.
+        */
+       int                  cui_glimpse;
        /**
         * Layout version when this IO is initialized
         */
@@ -118,7 +136,7 @@ struct ccc_io {
 };
 
 /**
- * True, if \a io is a normal io, False for other (sendfile, splice*).
+ * True, if \a io is a normal io, False for other splice_{read,write}.
  * must be impementated in arch specific code.
  */
 int cl_is_normalio(const struct lu_env *env, const struct cl_io *io);
@@ -195,12 +213,12 @@ struct ccc_object {
          * we don't need to hold any lock..
          */
         int                     cob_transient_pages;
-        /**
-         * Number of outstanding mmaps on this file.
-         *
-         * \see ll_vm_open(), ll_vm_close().
-         */
-        cfs_atomic_t            cob_mmap_cnt;
+       /**
+        * Number of outstanding mmaps on this file.
+        *
+        * \see ll_vm_open(), ll_vm_close().
+        */
+       atomic_t                cob_mmap_cnt;
 
        /**
         * various flags
@@ -240,6 +258,11 @@ static inline struct ccc_page *cl2ccc_page(const struct cl_page_slice *slice)
         return container_of(slice, struct ccc_page, cpg_cl);
 }
 
+static inline pgoff_t ccc_index(struct ccc_page *ccc)
+{
+       return ccc->cpg_cl.cpl_index;
+}
+
 struct cl_page    *ccc_vmpage_page_transient(struct page *vmpage);
 
 struct ccc_device {
@@ -302,10 +325,6 @@ int ccc_object_glimpse(const struct lu_env *env,
                        const struct cl_object *obj, struct ost_lvb *lvb);
 int ccc_conf_set(const struct lu_env *env, struct cl_object *obj,
                  const struct cl_object_conf *conf);
-struct page *ccc_page_vmpage(const struct lu_env *env,
-                            const struct cl_page_slice *slice);
-int ccc_page_is_under_lock(const struct lu_env *env,
-                           const struct cl_page_slice *slice, struct cl_io *io);
 int ccc_fail(const struct lu_env *env, const struct cl_page_slice *slice);
 void ccc_transient_page_verify(const struct cl_page *page);
 int  ccc_transient_page_own(const struct lu_env *env,
@@ -438,14 +457,31 @@ void ccc_inode_lsm_put(struct inode *inode, struct lov_stripe_md *lsm);
  * layer for recovery purposes.
  */
 struct cl_client_cache {
-       cfs_atomic_t            ccc_users;    /* # of users (OSCs) */
+       atomic_t                ccc_users;    /* # of users (OSCs) */
        cfs_list_t              ccc_lru;      /* LRU of cached clean pages */
        spinlock_t              ccc_lru_lock; /* lock for list */
-       cfs_atomic_t            ccc_lru_left; /* # of LRU entries available */
+       atomic_t                ccc_lru_left; /* # of LRU entries available */
        unsigned long           ccc_lru_max;  /* Max # of LRU entries */
        unsigned int            ccc_lru_shrinkers;  /* # of threads shrinking */
-       cfs_atomic_t            ccc_unstable_nr;    /* # of pages pinned */
+       atomic_t                ccc_unstable_nr;    /* # of pages pinned */
        wait_queue_head_t       ccc_unstable_waitq; /* Signaled on BRW commit */
 };
 
+enum {
+       LUSTRE_OPC_MKDIR    = 0,
+       LUSTRE_OPC_SYMLINK  = 1,
+       LUSTRE_OPC_MKNOD    = 2,
+       LUSTRE_OPC_CREATE   = 3,
+       LUSTRE_OPC_ANY      = 5
+};
+
+enum op_cli_flags {
+       CLI_SET_MEA     = 1 << 0,
+       CLI_RM_ENTRY    = 1 << 1,
+       CLI_HASH64      = 1 << 2,
+       CLI_API32       = 1 << 3,
+       CLI_MIGRATE     = 1 << 4,
+       CLI_NEXT_ENTRY  = 1 << 5,
+};
+
 #endif /*LCLIENT_H */