Branch HEAD

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

diff --git a/lustre/include/lclient.h b/lustre/include/lclient.h
index 2eb2425..ead82c3 100644 (file)
--- a/lustre/include/lclient.h
+++ b/lustre/include/lclient.h
@@ -123,7 +123,6 @@ extern struct lu_context_key ccc_session_key;
 struct ccc_thread_info {
         struct cl_lock_descr cti_descr;
         struct cl_io         cti_io;
-        struct cl_sync_io    cti_sync_io;
         struct cl_attr       cti_attr;
 };
 
@@ -136,6 +135,13 @@ static inline struct ccc_thread_info *ccc_env_info(const struct lu_env *env)
         return info;
 }
 
+static inline struct cl_attr *ccc_env_thread_attr(const struct lu_env *env)
+{
+        struct cl_attr *attr = &ccc_env_info(env)->cti_attr;
+        memset(attr, 0, sizeof(*attr));
+        return attr;
+}
+
 struct ccc_session {
         struct ccc_io cs_ios;
 };
@@ -202,7 +208,6 @@ struct ccc_page {
         struct list_head     cpg_pending_linkage;
         /** VM page */
         cfs_page_t          *cpg_page;
-        struct cl_sync_io   *cpg_sync_io;
         /**
          * checksum for paranoid I/O debugging enabled by
          * ENABLE_LLITE_CHECKSUM configuration option.
@@ -287,9 +292,9 @@ 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);
-void ccc_transient_page_own(const struct lu_env *env,
+int  ccc_transient_page_own(const struct lu_env *env,
                             const struct cl_page_slice *slice,
-                            struct cl_io *io);
+                            struct cl_io *io, int nonblock);
 void ccc_transient_page_assume(const struct lu_env *env,
                                const struct cl_page_slice *slice,
                                struct cl_io *io);
@@ -366,6 +371,8 @@ void cl_inode_fini(struct inode *inode);
 int cl_local_size(struct inode *inode);
 
 __u16 ll_dirent_type_get(struct lu_dirent *ent);
+ino_t cl_fid_build_ino(struct lu_fid *fid);
+__u32 cl_fid_build_gen(struct lu_fid *fid);
 
 #ifdef INVARIANT_CHECK
 # define CLOBINVRNT(env, clob, expr)                                    \
@@ -383,7 +390,7 @@ __u16 ll_dirent_type_get(struct lu_dirent *ent);
 int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp);
 int cl_ocd_update(struct obd_device *host,
                   struct obd_device *watched,
-                  enum obd_notify_event ev, void *owner);
+                  enum obd_notify_event ev, void *owner, void *data);
 
 struct ccc_grouplock {
         struct lu_env   *cg_env;