Commit 3dea3478 authored by Andreas Dilger's avatar Andreas Dilger Committed by Greg Kroah-Hartman

staging: lustre: ldlm: remove ldlm_policy_data_t typedef usage from code

Replace usage of ldlm_policy_data_t with named enums
to conform to upstream coding style.
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: http://review.whamcloud.com/15300
Reviewed-on: http://review.whamcloud.com/15301Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5bba129e
...@@ -553,15 +553,15 @@ struct ldlm_flock { ...@@ -553,15 +553,15 @@ struct ldlm_flock {
__u32 pid; __u32 pid;
}; };
typedef union { union ldlm_policy_data {
struct ldlm_extent l_extent; struct ldlm_extent l_extent;
struct ldlm_flock l_flock; struct ldlm_flock l_flock;
struct ldlm_inodebits l_inodebits; struct ldlm_inodebits l_inodebits;
} ldlm_policy_data_t; };
void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type, void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type,
const ldlm_wire_policy_data_t *wpolicy, const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy); union ldlm_policy_data *lpolicy);
enum lvb_type { enum lvb_type {
LVB_T_NONE = 0, LVB_T_NONE = 0,
...@@ -690,7 +690,7 @@ struct ldlm_lock { ...@@ -690,7 +690,7 @@ struct ldlm_lock {
* Representation of private data specific for a lock type. * Representation of private data specific for a lock type.
* Examples are: extent range for extent lock or bitmask for ibits locks * Examples are: extent range for extent lock or bitmask for ibits locks
*/ */
ldlm_policy_data_t l_policy_data; union ldlm_policy_data l_policy_data;
/** /**
* Lock state flags. Protected by lr_lock. * Lock state flags. Protected by lr_lock.
...@@ -1175,7 +1175,7 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock); ...@@ -1175,7 +1175,7 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock);
void ldlm_lock_allow_match_locked(struct ldlm_lock *lock); void ldlm_lock_allow_match_locked(struct ldlm_lock *lock);
enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
const struct ldlm_res_id *, const struct ldlm_res_id *,
enum ldlm_type type, ldlm_policy_data_t *, enum ldlm_type type, union ldlm_policy_data *,
enum ldlm_mode mode, struct lustre_handle *, enum ldlm_mode mode, struct lustre_handle *,
int unref); int unref);
enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh, enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,
...@@ -1239,7 +1239,7 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data); ...@@ -1239,7 +1239,7 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data);
int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
struct ldlm_enqueue_info *einfo, struct ldlm_enqueue_info *einfo,
const struct ldlm_res_id *res_id, const struct ldlm_res_id *res_id,
ldlm_policy_data_t const *policy, __u64 *flags, union ldlm_policy_data const *policy, __u64 *flags,
void *lvb, __u32 lvb_len, enum lvb_type lvb_type, void *lvb, __u32 lvb_len, enum lvb_type lvb_type,
struct lustre_handle *lockh, int async); struct lustre_handle *lockh, int async);
int ldlm_prep_enqueue_req(struct obd_export *exp, int ldlm_prep_enqueue_req(struct obd_export *exp,
...@@ -1263,13 +1263,13 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *, ...@@ -1263,13 +1263,13 @@ int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *,
enum ldlm_cancel_flags flags, void *opaque); enum ldlm_cancel_flags flags, void *opaque);
int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns, int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
const struct ldlm_res_id *res_id, const struct ldlm_res_id *res_id,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
enum ldlm_cancel_flags flags, enum ldlm_cancel_flags flags,
void *opaque); void *opaque);
int ldlm_cancel_resource_local(struct ldlm_resource *res, int ldlm_cancel_resource_local(struct ldlm_resource *res,
struct list_head *cancels, struct list_head *cancels,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, __u64 lock_flags, enum ldlm_mode mode, __u64 lock_flags,
enum ldlm_cancel_flags cancel_flags, enum ldlm_cancel_flags cancel_flags,
void *opaque); void *opaque);
......
...@@ -879,7 +879,7 @@ struct md_ops { ...@@ -879,7 +879,7 @@ struct md_ops {
const void *, size_t, umode_t, uid_t, gid_t, const void *, size_t, umode_t, uid_t, gid_t,
cfs_cap_t, __u64, struct ptlrpc_request **); cfs_cap_t, __u64, struct ptlrpc_request **);
int (*enqueue)(struct obd_export *, struct ldlm_enqueue_info *, int (*enqueue)(struct obd_export *, struct ldlm_enqueue_info *,
const ldlm_policy_data_t *, const union ldlm_policy_data *,
struct lookup_intent *, struct md_op_data *, struct lookup_intent *, struct md_op_data *,
struct lustre_handle *, __u64); struct lustre_handle *, __u64);
int (*getattr)(struct obd_export *, struct md_op_data *, int (*getattr)(struct obd_export *, struct md_op_data *,
...@@ -935,11 +935,11 @@ struct md_ops { ...@@ -935,11 +935,11 @@ struct md_ops {
enum ldlm_mode (*lock_match)(struct obd_export *, __u64, enum ldlm_mode (*lock_match)(struct obd_export *, __u64,
const struct lu_fid *, enum ldlm_type, const struct lu_fid *, enum ldlm_type,
ldlm_policy_data_t *, enum ldlm_mode, union ldlm_policy_data *, enum ldlm_mode,
struct lustre_handle *); struct lustre_handle *);
int (*cancel_unused)(struct obd_export *, const struct lu_fid *, int (*cancel_unused)(struct obd_export *, const struct lu_fid *,
ldlm_policy_data_t *, enum ldlm_mode, union ldlm_policy_data *, enum ldlm_mode,
enum ldlm_cancel_flags flags, void *opaque); enum ldlm_cancel_flags flags, void *opaque);
int (*get_fid_from_lsm)(struct obd_export *, int (*get_fid_from_lsm)(struct obd_export *,
......
...@@ -1208,7 +1208,7 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data, ...@@ -1208,7 +1208,7 @@ static inline int md_create(struct obd_export *exp, struct md_op_data *op_data,
static inline int md_enqueue(struct obd_export *exp, static inline int md_enqueue(struct obd_export *exp,
struct ldlm_enqueue_info *einfo, struct ldlm_enqueue_info *einfo,
const ldlm_policy_data_t *policy, const union ldlm_policy_data *policy,
struct lookup_intent *it, struct lookup_intent *it,
struct md_op_data *op_data, struct md_op_data *op_data,
struct lustre_handle *lockh, struct lustre_handle *lockh,
...@@ -1407,7 +1407,7 @@ static inline int md_set_lock_data(struct obd_export *exp, ...@@ -1407,7 +1407,7 @@ static inline int md_set_lock_data(struct obd_export *exp,
static inline int md_cancel_unused(struct obd_export *exp, static inline int md_cancel_unused(struct obd_export *exp,
const struct lu_fid *fid, const struct lu_fid *fid,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
enum ldlm_cancel_flags flags, enum ldlm_cancel_flags flags,
void *opaque) void *opaque)
...@@ -1425,7 +1425,7 @@ static inline int md_cancel_unused(struct obd_export *exp, ...@@ -1425,7 +1425,7 @@ static inline int md_cancel_unused(struct obd_export *exp,
static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags, static inline enum ldlm_mode md_lock_match(struct obd_export *exp, __u64 flags,
const struct lu_fid *fid, const struct lu_fid *fid,
enum ldlm_type type, enum ldlm_type type,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
struct lustre_handle *lockh) struct lustre_handle *lockh)
{ {
......
...@@ -241,7 +241,7 @@ void ldlm_extent_unlink_lock(struct ldlm_lock *lock) ...@@ -241,7 +241,7 @@ void ldlm_extent_unlink_lock(struct ldlm_lock *lock)
} }
void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy) union ldlm_policy_data *lpolicy)
{ {
memset(lpolicy, 0, sizeof(*lpolicy)); memset(lpolicy, 0, sizeof(*lpolicy));
lpolicy->l_extent.start = wpolicy->l_extent.start; lpolicy->l_extent.start = wpolicy->l_extent.start;
...@@ -249,7 +249,7 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, ...@@ -249,7 +249,7 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
lpolicy->l_extent.gid = wpolicy->l_extent.gid; lpolicy->l_extent.gid = wpolicy->l_extent.gid;
} }
void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy) ldlm_wire_policy_data_t *wpolicy)
{ {
memset(wpolicy, 0, sizeof(*wpolicy)); memset(wpolicy, 0, sizeof(*wpolicy));
......
...@@ -613,7 +613,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) ...@@ -613,7 +613,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
EXPORT_SYMBOL(ldlm_flock_completion_ast); EXPORT_SYMBOL(ldlm_flock_completion_ast);
void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy) union ldlm_policy_data *lpolicy)
{ {
memset(lpolicy, 0, sizeof(*lpolicy)); memset(lpolicy, 0, sizeof(*lpolicy));
lpolicy->l_flock.start = wpolicy->l_flock.lfw_start; lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
...@@ -622,7 +622,7 @@ void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, ...@@ -622,7 +622,7 @@ void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner; lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner;
} }
void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy) ldlm_wire_policy_data_t *wpolicy)
{ {
memset(wpolicy, 0, sizeof(*wpolicy)); memset(wpolicy, 0, sizeof(*wpolicy));
......
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
#include "ldlm_internal.h" #include "ldlm_internal.h"
void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy) union ldlm_policy_data *lpolicy)
{ {
memset(lpolicy, 0, sizeof(*lpolicy)); memset(lpolicy, 0, sizeof(*lpolicy));
lpolicy->l_inodebits.bits = wpolicy->l_inodebits.bits; lpolicy->l_inodebits.bits = wpolicy->l_inodebits.bits;
} }
void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy) ldlm_wire_policy_data_t *wpolicy)
{ {
memset(wpolicy, 0, sizeof(*wpolicy)); memset(wpolicy, 0, sizeof(*wpolicy));
......
...@@ -312,24 +312,24 @@ static inline int is_granted_or_cancelled(struct ldlm_lock *lock) ...@@ -312,24 +312,24 @@ static inline int is_granted_or_cancelled(struct ldlm_lock *lock)
} }
typedef void (*ldlm_policy_wire_to_local_t)(const ldlm_wire_policy_data_t *, typedef void (*ldlm_policy_wire_to_local_t)(const ldlm_wire_policy_data_t *,
ldlm_policy_data_t *); union ldlm_policy_data *);
typedef void (*ldlm_policy_local_to_wire_t)(const ldlm_policy_data_t *, typedef void (*ldlm_policy_local_to_wire_t)(const union ldlm_policy_data *,
ldlm_wire_policy_data_t *); ldlm_wire_policy_data_t *);
void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy); union ldlm_policy_data *lpolicy);
void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_plain_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy); ldlm_wire_policy_data_t *wpolicy);
void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy); union ldlm_policy_data *lpolicy);
void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy); ldlm_wire_policy_data_t *wpolicy);
void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy); union ldlm_policy_data *lpolicy);
void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_extent_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy); ldlm_wire_policy_data_t *wpolicy);
void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy); union ldlm_policy_data *lpolicy);
void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_flock_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy); ldlm_wire_policy_data_t *wpolicy);
...@@ -81,7 +81,7 @@ static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = { ...@@ -81,7 +81,7 @@ static ldlm_policy_local_to_wire_t ldlm_policy_local_to_wire[] = {
* Converts lock policy from local format to on the wire lock_desc format * Converts lock policy from local format to on the wire lock_desc format
*/ */
static void ldlm_convert_policy_to_wire(enum ldlm_type type, static void ldlm_convert_policy_to_wire(enum ldlm_type type,
const ldlm_policy_data_t *lpolicy, const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy) ldlm_wire_policy_data_t *wpolicy)
{ {
ldlm_policy_local_to_wire_t convert; ldlm_policy_local_to_wire_t convert;
...@@ -96,7 +96,7 @@ static void ldlm_convert_policy_to_wire(enum ldlm_type type, ...@@ -96,7 +96,7 @@ static void ldlm_convert_policy_to_wire(enum ldlm_type type,
*/ */
void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type, void ldlm_convert_policy_to_local(struct obd_export *exp, enum ldlm_type type,
const ldlm_wire_policy_data_t *wpolicy, const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy) union ldlm_policy_data *lpolicy)
{ {
ldlm_policy_wire_to_local_t convert; ldlm_policy_wire_to_local_t convert;
...@@ -1049,7 +1049,7 @@ struct lock_match_data { ...@@ -1049,7 +1049,7 @@ struct lock_match_data {
struct ldlm_lock *lmd_old; struct ldlm_lock *lmd_old;
struct ldlm_lock *lmd_lock; struct ldlm_lock *lmd_lock;
enum ldlm_mode *lmd_mode; enum ldlm_mode *lmd_mode;
ldlm_policy_data_t *lmd_policy; union ldlm_policy_data *lmd_policy;
__u64 lmd_flags; __u64 lmd_flags;
int lmd_unref; int lmd_unref;
}; };
...@@ -1063,7 +1063,7 @@ struct lock_match_data { ...@@ -1063,7 +1063,7 @@ struct lock_match_data {
*/ */
static int lock_matches(struct ldlm_lock *lock, struct lock_match_data *data) static int lock_matches(struct ldlm_lock *lock, struct lock_match_data *data)
{ {
ldlm_policy_data_t *lpol = &lock->l_policy_data; union ldlm_policy_data *lpol = &lock->l_policy_data;
enum ldlm_mode match; enum ldlm_mode match;
if (lock == data->lmd_old) if (lock == data->lmd_old)
...@@ -1280,7 +1280,7 @@ EXPORT_SYMBOL(ldlm_lock_allow_match); ...@@ -1280,7 +1280,7 @@ EXPORT_SYMBOL(ldlm_lock_allow_match);
enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags,
const struct ldlm_res_id *res_id, const struct ldlm_res_id *res_id,
enum ldlm_type type, enum ldlm_type type,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
struct lustre_handle *lockh, int unref) struct lustre_handle *lockh, int unref)
{ {
......
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
#include "ldlm_internal.h" #include "ldlm_internal.h"
void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
ldlm_policy_data_t *lpolicy) union ldlm_policy_data *lpolicy)
{ {
/* No policy for plain locks */ /* No policy for plain locks */
} }
void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, void ldlm_plain_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
ldlm_wire_policy_data_t *wpolicy) ldlm_wire_policy_data_t *wpolicy)
{ {
/* No policy for plain locks */ /* No policy for plain locks */
......
...@@ -682,7 +682,7 @@ static struct ptlrpc_request *ldlm_enqueue_pack(struct obd_export *exp, ...@@ -682,7 +682,7 @@ static struct ptlrpc_request *ldlm_enqueue_pack(struct obd_export *exp,
int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp, int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
struct ldlm_enqueue_info *einfo, struct ldlm_enqueue_info *einfo,
const struct ldlm_res_id *res_id, const struct ldlm_res_id *res_id,
ldlm_policy_data_t const *policy, __u64 *flags, union ldlm_policy_data const *policy, __u64 *flags,
void *lvb, __u32 lvb_len, enum lvb_type lvb_type, void *lvb, __u32 lvb_len, enum lvb_type lvb_type,
struct lustre_handle *lockh, int async) struct lustre_handle *lockh, int async)
{ {
...@@ -1528,7 +1528,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, ...@@ -1528,7 +1528,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
*/ */
int ldlm_cancel_resource_local(struct ldlm_resource *res, int ldlm_cancel_resource_local(struct ldlm_resource *res,
struct list_head *cancels, struct list_head *cancels,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, __u64 lock_flags, enum ldlm_mode mode, __u64 lock_flags,
enum ldlm_cancel_flags cancel_flags, enum ldlm_cancel_flags cancel_flags,
void *opaque) void *opaque)
...@@ -1645,7 +1645,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list); ...@@ -1645,7 +1645,7 @@ EXPORT_SYMBOL(ldlm_cli_cancel_list);
*/ */
int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns, int ldlm_cli_cancel_unused_resource(struct ldlm_namespace *ns,
const struct ldlm_res_id *res_id, const struct ldlm_res_id *res_id,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
enum ldlm_cancel_flags flags, enum ldlm_cancel_flags flags,
void *opaque) void *opaque)
......
...@@ -265,7 +265,9 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode, ...@@ -265,7 +265,9 @@ static int ll_md_close(struct obd_export *md_exp, struct inode *inode,
int lockmode; int lockmode;
__u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK; __u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;
struct lustre_handle lockh; struct lustre_handle lockh;
ldlm_policy_data_t policy = {.l_inodebits = {MDS_INODELOCK_OPEN} }; union ldlm_policy_data policy = {
.l_inodebits = { MDS_INODELOCK_OPEN }
};
int rc = 0; int rc = 0;
/* clear group lock, if present */ /* clear group lock, if present */
...@@ -2427,7 +2429,7 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) ...@@ -2427,7 +2429,7 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
}; };
struct md_op_data *op_data; struct md_op_data *op_data;
struct lustre_handle lockh = {0}; struct lustre_handle lockh = {0};
ldlm_policy_data_t flock = { {0} }; union ldlm_policy_data flock = { { 0 } };
int fl_type = file_lock->fl_type; int fl_type = file_lock->fl_type;
__u64 flags = 0; __u64 flags = 0;
int rc; int rc;
...@@ -2676,7 +2678,7 @@ int ll_have_md_lock(struct inode *inode, __u64 *bits, ...@@ -2676,7 +2678,7 @@ int ll_have_md_lock(struct inode *inode, __u64 *bits,
enum ldlm_mode l_req_mode) enum ldlm_mode l_req_mode)
{ {
struct lustre_handle lockh; struct lustre_handle lockh;
ldlm_policy_data_t policy; union ldlm_policy_data policy;
enum ldlm_mode mode = (l_req_mode == LCK_MINMODE) ? enum ldlm_mode mode = (l_req_mode == LCK_MINMODE) ?
(LCK_CR | LCK_CW | LCK_PR | LCK_PW) : l_req_mode; (LCK_CR | LCK_CW | LCK_PR | LCK_PW) : l_req_mode;
struct lu_fid *fid; struct lu_fid *fid;
...@@ -2717,7 +2719,7 @@ enum ldlm_mode ll_take_md_lock(struct inode *inode, __u64 bits, ...@@ -2717,7 +2719,7 @@ enum ldlm_mode ll_take_md_lock(struct inode *inode, __u64 bits,
struct lustre_handle *lockh, __u64 flags, struct lustre_handle *lockh, __u64 flags,
enum ldlm_mode mode) enum ldlm_mode mode)
{ {
ldlm_policy_data_t policy = { .l_inodebits = {bits} }; union ldlm_policy_data policy = { .l_inodebits = { bits } };
struct lu_fid *fid; struct lu_fid *fid;
fid = &ll_i2info(inode)->lli_fid; fid = &ll_i2info(inode)->lli_fid;
......
...@@ -905,7 +905,7 @@ static inline struct vvp_io_args *ll_env_args(const struct lu_env *env) ...@@ -905,7 +905,7 @@ static inline struct vvp_io_args *ll_env_args(const struct lu_env *env)
int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last); int ll_teardown_mmaps(struct address_space *mapping, __u64 first, __u64 last);
int ll_file_mmap(struct file *file, struct vm_area_struct *vma); int ll_file_mmap(struct file *file, struct vm_area_struct *vma);
void policy_from_vma(ldlm_policy_data_t *policy, struct vm_area_struct *vma, void policy_from_vma(union ldlm_policy_data *policy, struct vm_area_struct *vma,
unsigned long addr, size_t count); unsigned long addr, size_t count);
struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr, struct vm_area_struct *our_vma(struct mm_struct *mm, unsigned long addr,
size_t count); size_t count);
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
static const struct vm_operations_struct ll_file_vm_ops; static const struct vm_operations_struct ll_file_vm_ops;
void policy_from_vma(ldlm_policy_data_t *policy, void policy_from_vma(union ldlm_policy_data *policy,
struct vm_area_struct *vma, unsigned long addr, struct vm_area_struct *vma, unsigned long addr,
size_t count) size_t count)
{ {
......
...@@ -370,7 +370,7 @@ static int vvp_mmap_locks(const struct lu_env *env, ...@@ -370,7 +370,7 @@ static int vvp_mmap_locks(const struct lu_env *env,
struct mm_struct *mm = current->mm; struct mm_struct *mm = current->mm;
struct vm_area_struct *vma; struct vm_area_struct *vma;
struct cl_lock_descr *descr = &cti->vti_descr; struct cl_lock_descr *descr = &cti->vti_descr;
ldlm_policy_data_t policy; union ldlm_policy_data policy;
unsigned long addr; unsigned long addr;
ssize_t count; ssize_t count;
int result = 0; int result = 0;
......
...@@ -1720,7 +1720,7 @@ static int lmv_create(struct obd_export *exp, struct md_op_data *op_data, ...@@ -1720,7 +1720,7 @@ static int lmv_create(struct obd_export *exp, struct md_op_data *op_data,
static int static int
lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, lmv_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
const ldlm_policy_data_t *policy, const union ldlm_policy_data *policy,
struct lookup_intent *it, struct md_op_data *op_data, struct lookup_intent *it, struct md_op_data *op_data,
struct lustre_handle *lockh, __u64 extra_lock_flags) struct lustre_handle *lockh, __u64 extra_lock_flags)
{ {
...@@ -1816,7 +1816,7 @@ static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt, ...@@ -1816,7 +1816,7 @@ static int lmv_early_cancel(struct obd_export *exp, struct lmv_tgt_desc *tgt,
struct lu_fid *fid = md_op_data_fid(op_data, flag); struct lu_fid *fid = md_op_data_fid(op_data, flag);
struct obd_device *obd = exp->exp_obd; struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv; struct lmv_obd *lmv = &obd->u.lmv;
ldlm_policy_data_t policy = { {0} }; union ldlm_policy_data policy = { { 0 } };
int rc = 0; int rc = 0;
if (!fid_is_sane(fid)) if (!fid_is_sane(fid))
...@@ -2890,8 +2890,9 @@ void lmv_free_memmd(struct lmv_stripe_md *lsm) ...@@ -2890,8 +2890,9 @@ void lmv_free_memmd(struct lmv_stripe_md *lsm)
EXPORT_SYMBOL(lmv_free_memmd); EXPORT_SYMBOL(lmv_free_memmd);
static int lmv_cancel_unused(struct obd_export *exp, const struct lu_fid *fid, static int lmv_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
ldlm_policy_data_t *policy, enum ldlm_mode mode, union ldlm_policy_data *policy,
enum ldlm_cancel_flags flags, void *opaque) enum ldlm_mode mode, enum ldlm_cancel_flags flags,
void *opaque)
{ {
struct obd_device *obd = exp->exp_obd; struct obd_device *obd = exp->exp_obd;
struct lmv_obd *lmv = &obd->u.lmv; struct lmv_obd *lmv = &obd->u.lmv;
...@@ -2933,7 +2934,7 @@ static int lmv_set_lock_data(struct obd_export *exp, ...@@ -2933,7 +2934,7 @@ static int lmv_set_lock_data(struct obd_export *exp,
static enum ldlm_mode lmv_lock_match(struct obd_export *exp, __u64 flags, static enum ldlm_mode lmv_lock_match(struct obd_export *exp, __u64 flags,
const struct lu_fid *fid, const struct lu_fid *fid,
enum ldlm_type type, enum ldlm_type type,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
struct lustre_handle *lockh) struct lustre_handle *lockh)
{ {
......
...@@ -75,7 +75,7 @@ int mdc_intent_lock(struct obd_export *exp, ...@@ -75,7 +75,7 @@ int mdc_intent_lock(struct obd_export *exp,
__u64 extra_lock_flags); __u64 extra_lock_flags);
int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
const ldlm_policy_data_t *policy, const union ldlm_policy_data *policy,
struct lookup_intent *it, struct md_op_data *op_data, struct lookup_intent *it, struct md_op_data *op_data,
struct lustre_handle *lockh, __u64 extra_lock_flags); struct lustre_handle *lockh, __u64 extra_lock_flags);
...@@ -109,7 +109,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, ...@@ -109,7 +109,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data, int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
struct ptlrpc_request **request); struct ptlrpc_request **request);
int mdc_cancel_unused(struct obd_export *exp, const struct lu_fid *fid, int mdc_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
ldlm_policy_data_t *policy, enum ldlm_mode mode, union ldlm_policy_data *policy, enum ldlm_mode mode,
enum ldlm_cancel_flags flags, void *opaque); enum ldlm_cancel_flags flags, void *opaque);
int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it, int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
...@@ -121,7 +121,8 @@ int mdc_intent_getattr_async(struct obd_export *exp, ...@@ -121,7 +121,8 @@ int mdc_intent_getattr_async(struct obd_export *exp,
enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags, enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
const struct lu_fid *fid, enum ldlm_type type, const struct lu_fid *fid, enum ldlm_type type,
ldlm_policy_data_t *policy, enum ldlm_mode mode, union ldlm_policy_data *policy,
enum ldlm_mode mode,
struct lustre_handle *lockh); struct lustre_handle *lockh);
static inline int mdc_prep_elc_req(struct obd_export *exp, static inline int mdc_prep_elc_req(struct obd_export *exp,
......
...@@ -131,7 +131,8 @@ int mdc_set_lock_data(struct obd_export *exp, const struct lustre_handle *lockh, ...@@ -131,7 +131,8 @@ int mdc_set_lock_data(struct obd_export *exp, const struct lustre_handle *lockh,
enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags, enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
const struct lu_fid *fid, enum ldlm_type type, const struct lu_fid *fid, enum ldlm_type type,
ldlm_policy_data_t *policy, enum ldlm_mode mode, union ldlm_policy_data *policy,
enum ldlm_mode mode,
struct lustre_handle *lockh) struct lustre_handle *lockh)
{ {
struct ldlm_res_id res_id; struct ldlm_res_id res_id;
...@@ -147,7 +148,7 @@ enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags, ...@@ -147,7 +148,7 @@ enum ldlm_mode mdc_lock_match(struct obd_export *exp, __u64 flags,
int mdc_cancel_unused(struct obd_export *exp, int mdc_cancel_unused(struct obd_export *exp,
const struct lu_fid *fid, const struct lu_fid *fid,
ldlm_policy_data_t *policy, union ldlm_policy_data *policy,
enum ldlm_mode mode, enum ldlm_mode mode,
enum ldlm_cancel_flags flags, enum ldlm_cancel_flags flags,
void *opaque) void *opaque)
...@@ -686,20 +687,20 @@ static int mdc_finish_enqueue(struct obd_export *exp, ...@@ -686,20 +687,20 @@ static int mdc_finish_enqueue(struct obd_export *exp,
* we don't know in advance the file type. * we don't know in advance the file type.
*/ */
int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo, int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
const ldlm_policy_data_t *policy, const union ldlm_policy_data *policy,
struct lookup_intent *it, struct md_op_data *op_data, struct lookup_intent *it, struct md_op_data *op_data,
struct lustre_handle *lockh, u64 extra_lock_flags) struct lustre_handle *lockh, u64 extra_lock_flags)
{ {
static const ldlm_policy_data_t lookup_policy = { static const union ldlm_policy_data lookup_policy = {
.l_inodebits = { MDS_INODELOCK_LOOKUP } .l_inodebits = { MDS_INODELOCK_LOOKUP }
}; };
static const ldlm_policy_data_t update_policy = { static const union ldlm_policy_data update_policy = {
.l_inodebits = { MDS_INODELOCK_UPDATE } .l_inodebits = { MDS_INODELOCK_UPDATE }
}; };
static const ldlm_policy_data_t layout_policy = { static const union ldlm_policy_data layout_policy = {
.l_inodebits = { MDS_INODELOCK_LAYOUT } .l_inodebits = { MDS_INODELOCK_LAYOUT }
}; };
static const ldlm_policy_data_t getxattr_policy = { static const union ldlm_policy_data getxattr_policy = {
.l_inodebits = { MDS_INODELOCK_XATTR } .l_inodebits = { MDS_INODELOCK_XATTR }
}; };
struct obd_device *obddev = class_exp2obd(exp); struct obd_device *obddev = class_exp2obd(exp);
...@@ -925,7 +926,7 @@ static int mdc_finish_intent_lock(struct obd_export *exp, ...@@ -925,7 +926,7 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
*/ */
lock = ldlm_handle2lock(lockh); lock = ldlm_handle2lock(lockh);
if (lock) { if (lock) {
ldlm_policy_data_t policy = lock->l_policy_data; union ldlm_policy_data policy = lock->l_policy_data;
LDLM_DEBUG(lock, "matching against this"); LDLM_DEBUG(lock, "matching against this");
...@@ -961,7 +962,7 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it, ...@@ -961,7 +962,7 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
*/ */
struct ldlm_res_id res_id; struct ldlm_res_id res_id;
struct lustre_handle lockh; struct lustre_handle lockh;
ldlm_policy_data_t policy; union ldlm_policy_data policy;
enum ldlm_mode mode; enum ldlm_mode mode;
if (it->it_lock_handle) { if (it->it_lock_handle) {
...@@ -1163,9 +1164,8 @@ int mdc_intent_getattr_async(struct obd_export *exp, ...@@ -1163,9 +1164,8 @@ int mdc_intent_getattr_async(struct obd_export *exp,
* for statahead currently. Consider CMD in future, such two bits * for statahead currently. Consider CMD in future, such two bits
* maybe managed by different MDS, should be adjusted then. * maybe managed by different MDS, should be adjusted then.
*/ */
ldlm_policy_data_t policy = { union ldlm_policy_data policy = {
.l_inodebits = { MDS_INODELOCK_LOOKUP | .l_inodebits = { MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE }
MDS_INODELOCK_UPDATE }
}; };
int rc = 0; int rc = 0;
__u64 flags = LDLM_FL_HAS_INTENT; __u64 flags = LDLM_FL_HAS_INTENT;
......
...@@ -66,7 +66,7 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid, ...@@ -66,7 +66,7 @@ int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
__u64 bits) __u64 bits)
{ {
struct ldlm_namespace *ns = exp->exp_obd->obd_namespace; struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
ldlm_policy_data_t policy = {}; union ldlm_policy_data policy = {};
struct ldlm_res_id res_id; struct ldlm_res_id res_id;
struct ldlm_resource *res; struct ldlm_resource *res;
int count; int count;
......
...@@ -886,7 +886,7 @@ static int mgc_set_mgs_param(struct obd_export *exp, ...@@ -886,7 +886,7 @@ static int mgc_set_mgs_param(struct obd_export *exp,
/* Take a config lock so we can get cancel notifications */ /* Take a config lock so we can get cancel notifications */
static int mgc_enqueue(struct obd_export *exp, __u32 type, static int mgc_enqueue(struct obd_export *exp, __u32 type,
ldlm_policy_data_t *policy, __u32 mode, union ldlm_policy_data *policy, __u32 mode,
__u64 *flags, void *bl_cb, void *cp_cb, void *gl_cb, __u64 *flags, void *bl_cb, void *cp_cb, void *gl_cb,
void *data, __u32 lvb_len, void *lvb_swabber, void *data, __u32 lvb_len, void *lvb_swabber,
struct lustre_handle *lockh) struct lustre_handle *lockh)
......
...@@ -95,7 +95,7 @@ struct osc_session { ...@@ -95,7 +95,7 @@ struct osc_session {
#define OTI_PVEC_SIZE 256 #define OTI_PVEC_SIZE 256
struct osc_thread_info { struct osc_thread_info {
struct ldlm_res_id oti_resname; struct ldlm_res_id oti_resname;
ldlm_policy_data_t oti_policy; union ldlm_policy_data oti_policy;
struct cl_lock_descr oti_descr; struct cl_lock_descr oti_descr;
struct cl_attr oti_attr; struct cl_attr oti_attr;
struct lustre_handle oti_handle; struct lustre_handle oti_handle;
...@@ -394,7 +394,8 @@ struct lu_object *osc_object_alloc(const struct lu_env *env, ...@@ -394,7 +394,8 @@ struct lu_object *osc_object_alloc(const struct lu_env *env,
int osc_page_init(const struct lu_env *env, struct cl_object *obj, int osc_page_init(const struct lu_env *env, struct cl_object *obj,
struct cl_page *page, pgoff_t ind); struct cl_page *page, pgoff_t ind);
void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj, void osc_index2policy(union ldlm_policy_data *policy,
const struct cl_object *obj,
pgoff_t start, pgoff_t end); pgoff_t start, pgoff_t end);
int osc_lvb_print(const struct lu_env *env, void *cookie, int osc_lvb_print(const struct lu_env *env, void *cookie,
lu_printer_t p, const struct ost_lvb *lvb); lu_printer_t p, const struct ost_lvb *lvb);
......
...@@ -107,14 +107,14 @@ typedef int (*osc_enqueue_upcall_f)(void *cookie, struct lustre_handle *lockh, ...@@ -107,14 +107,14 @@ typedef int (*osc_enqueue_upcall_f)(void *cookie, struct lustre_handle *lockh,
int rc); int rc);
int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
__u64 *flags, ldlm_policy_data_t *policy, __u64 *flags, union ldlm_policy_data *policy,
struct ost_lvb *lvb, int kms_valid, struct ost_lvb *lvb, int kms_valid,
osc_enqueue_upcall_f upcall, osc_enqueue_upcall_f upcall,
void *cookie, struct ldlm_enqueue_info *einfo, void *cookie, struct ldlm_enqueue_info *einfo,
struct ptlrpc_request_set *rqset, int async, int agl); struct ptlrpc_request_set *rqset, int async, int agl);
int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
__u32 type, ldlm_policy_data_t *policy, __u32 mode, __u32 type, union ldlm_policy_data *policy, __u32 mode,
__u64 *flags, void *data, struct lustre_handle *lockh, __u64 *flags, void *data, struct lustre_handle *lockh,
int unref); int unref);
......
...@@ -145,7 +145,7 @@ static void osc_lock_fini(const struct lu_env *env, ...@@ -145,7 +145,7 @@ static void osc_lock_fini(const struct lu_env *env,
static void osc_lock_build_policy(const struct lu_env *env, static void osc_lock_build_policy(const struct lu_env *env,
const struct cl_lock *lock, const struct cl_lock *lock,
ldlm_policy_data_t *policy) union ldlm_policy_data *policy)
{ {
const struct cl_lock_descr *d = &lock->cll_descr; const struct cl_lock_descr *d = &lock->cll_descr;
...@@ -914,7 +914,7 @@ static int osc_lock_enqueue(const struct lu_env *env, ...@@ -914,7 +914,7 @@ static int osc_lock_enqueue(const struct lu_env *env,
struct osc_lock *oscl = cl2osc_lock(slice); struct osc_lock *oscl = cl2osc_lock(slice);
struct cl_lock *lock = slice->cls_lock; struct cl_lock *lock = slice->cls_lock;
struct ldlm_res_id *resname = &info->oti_resname; struct ldlm_res_id *resname = &info->oti_resname;
ldlm_policy_data_t *policy = &info->oti_policy; union ldlm_policy_data *policy = &info->oti_policy;
osc_enqueue_upcall_f upcall = osc_lock_upcall; osc_enqueue_upcall_f upcall = osc_lock_upcall;
void *cookie = oscl; void *cookie = oscl;
bool async = false; bool async = false;
...@@ -1186,7 +1186,7 @@ struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env, ...@@ -1186,7 +1186,7 @@ struct ldlm_lock *osc_dlmlock_at_pgoff(const struct lu_env *env,
{ {
struct osc_thread_info *info = osc_env_info(env); struct osc_thread_info *info = osc_env_info(env);
struct ldlm_res_id *resname = &info->oti_resname; struct ldlm_res_id *resname = &info->oti_resname;
ldlm_policy_data_t *policy = &info->oti_policy; union ldlm_policy_data *policy = &info->oti_policy;
struct lustre_handle lockh; struct lustre_handle lockh;
struct ldlm_lock *lock = NULL; struct ldlm_lock *lock = NULL;
enum ldlm_mode mode; enum ldlm_mode mode;
......
...@@ -223,7 +223,7 @@ static int osc_object_fiemap(const struct lu_env *env, struct cl_object *obj, ...@@ -223,7 +223,7 @@ static int osc_object_fiemap(const struct lu_env *env, struct cl_object *obj,
struct fiemap *fiemap, size_t *buflen) struct fiemap *fiemap, size_t *buflen)
{ {
struct obd_export *exp = osc_export(cl2osc(obj)); struct obd_export *exp = osc_export(cl2osc(obj));
ldlm_policy_data_t policy; union ldlm_policy_data policy;
struct ptlrpc_request *req; struct ptlrpc_request *req;
struct lustre_handle lockh; struct lustre_handle lockh;
struct ldlm_res_id resid; struct ldlm_res_id resid;
......
...@@ -109,7 +109,8 @@ int osc_page_cache_add(const struct lu_env *env, ...@@ -109,7 +109,8 @@ int osc_page_cache_add(const struct lu_env *env,
return result; return result;
} }
void osc_index2policy(ldlm_policy_data_t *policy, const struct cl_object *obj, void osc_index2policy(union ldlm_policy_data *policy,
const struct cl_object *obj,
pgoff_t start, pgoff_t end) pgoff_t start, pgoff_t end)
{ {
memset(policy, 0, sizeof(*policy)); memset(policy, 0, sizeof(*policy));
......
...@@ -1953,7 +1953,7 @@ struct ptlrpc_request_set *PTLRPCD_SET = (void *)1; ...@@ -1953,7 +1953,7 @@ struct ptlrpc_request_set *PTLRPCD_SET = (void *)1;
* release locks just after they are obtained. * release locks just after they are obtained.
*/ */
int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
__u64 *flags, ldlm_policy_data_t *policy, __u64 *flags, union ldlm_policy_data *policy,
struct ost_lvb *lvb, int kms_valid, struct ost_lvb *lvb, int kms_valid,
osc_enqueue_upcall_f upcall, void *cookie, osc_enqueue_upcall_f upcall, void *cookie,
struct ldlm_enqueue_info *einfo, struct ldlm_enqueue_info *einfo,
...@@ -2104,7 +2104,7 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id, ...@@ -2104,7 +2104,7 @@ int osc_enqueue_base(struct obd_export *exp, struct ldlm_res_id *res_id,
} }
int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id, int osc_match_base(struct obd_export *exp, struct ldlm_res_id *res_id,
__u32 type, ldlm_policy_data_t *policy, __u32 mode, __u32 type, union ldlm_policy_data *policy, __u32 mode,
__u64 *flags, void *data, struct lustre_handle *lockh, __u64 *flags, void *data, struct lustre_handle *lockh,
int unref) int unref)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment