Branch HEAD

[fs/lustre-release.git] / lustre / mdc / mdc_internal.h

diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index 0676f0d..00092f4 100644 (file)
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -64,7 +64,7 @@ void mdc_setattr_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                      void *ea, int ealen, void *ea2, int ea2len);
 void mdc_create_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                      const void *data, int datalen, __u32 mode, __u32 uid,
-                     __u32 gid, __u32 cap_effective, __u64 rdev);
+                     __u32 gid, cfs_cap_t capability, __u64 rdev);
 void mdc_open_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                    __u32 mode, __u64 rdev, __u32 flags, const void *data,
                    int datalen);
@@ -78,25 +78,6 @@ void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data);
 void mdc_enter_request(struct client_obd *cli);
 void mdc_exit_request(struct client_obd *cli);
 
-static inline int client_is_remote(struct obd_export *exp)
-{
-        struct obd_import *imp = class_exp2cliimp(exp);
-
-        if (imp->imp_connect_flags_orig & OBD_CONNECT_RMT_CLIENT) {
-                if (!(imp->imp_connect_data.ocd_connect_flags &
-                    OBD_CONNECT_RMT_CLIENT))
-                        return 0;
-                else
-                        return 1;
-        } else {
-                if (!(imp->imp_connect_data.ocd_connect_flags &
-                    OBD_CONNECT_LCL_CLIENT))
-                        return 1;
-                else
-                        return 0;
-        }
-}
-
 /* mdc/mdc_locks.c */
 int mdc_set_lock_data(struct obd_export *exp,
                       __u64 *lockh, void *data);
@@ -140,11 +121,13 @@ int mdc_set_open_replay_data(struct obd_export *exp,
 
 int mdc_clear_open_replay_data(struct obd_export *exp,
                                struct obd_client_handle *och);
-void mdc_commit_delayed(struct ptlrpc_request *req);
+void mdc_commit_open(struct ptlrpc_request *req);
+void mdc_replay_open(struct ptlrpc_request *req);
 
 int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
                const void *data, int datalen, int mode, __u32 uid, __u32 gid,
-               __u32 cap_effective, __u64 rdev, struct ptlrpc_request **request);
+               cfs_cap_t capability, __u64 rdev,
+               struct ptlrpc_request **request);
 int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request);
 int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,