Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8beaf67 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: const qualify struct lustre_handle * params 



Add a const qualifier to several struct lustre_handle * parameters in
the LDLM interface.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-on: http://review.whamcloud.com/17071
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7403


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bf86fd9

drivers/staging/lustre/lustre/include/lustre_dlm.h

+9 −9
Original line number Original line Diff line number Diff line
@@ -1073,7 +1073,7 @@ void ldlm_lock2handle(const struct ldlm_lock *lock, 
struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *, __u64 flags);

struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *, __u64 flags);

void ldlm_cancel_callback(struct ldlm_lock *);

void ldlm_cancel_callback(struct ldlm_lock *);

int ldlm_lock_remove_from_lru(struct ldlm_lock *);

int ldlm_lock_remove_from_lru(struct ldlm_lock *);

int ldlm_lock_set_data(struct lustre_handle *, void *);

int ldlm_lock_set_data(const struct lustre_handle *lockh, void *data);





/**

/**

 * Obtain a lock reference by its handle.

 * Obtain a lock reference by its handle.
@@ -1162,10 +1162,10 @@ do { \ 
struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);

struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);

void ldlm_lock_put(struct ldlm_lock *lock);

void ldlm_lock_put(struct ldlm_lock *lock);

void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc);

void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc);

void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_addref(const struct lustre_handle *lockh, __u32 mode);

int  ldlm_lock_addref_try(struct lustre_handle *lockh, __u32 mode);

int  ldlm_lock_addref_try(const struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_decref(const struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh, __u32 mode);

void ldlm_lock_fail_match_locked(struct ldlm_lock *lock);

void ldlm_lock_fail_match_locked(struct ldlm_lock *lock);

void ldlm_lock_allow_match(struct ldlm_lock *lock);

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);
@@ -1174,10 +1174,10 @@ enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, 
			       enum ldlm_type type, ldlm_policy_data_t *,

			       enum ldlm_type type, ldlm_policy_data_t *,

			       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(struct lustre_handle *lockh,

enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,

					   __u64 *bits);

					   __u64 *bits);

void ldlm_lock_cancel(struct ldlm_lock *lock);

void ldlm_lock_cancel(struct ldlm_lock *lock);

void ldlm_lock_dump_handle(int level, struct lustre_handle *);

void ldlm_lock_dump_handle(int level, const struct lustre_handle *);

void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);

void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);





/* resource.c */

/* resource.c */
@@ -1251,9 +1251,9 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, 
			  enum ldlm_type type, __u8 with_policy,

			  enum ldlm_type type, __u8 with_policy,

			  enum ldlm_mode mode,

			  enum ldlm_mode mode,

			  __u64 *flags, void *lvb, __u32 lvb_len,

			  __u64 *flags, void *lvb, __u32 lvb_len,

			  struct lustre_handle *lockh, int rc);

			  const struct lustre_handle *lockh, int rc);

int ldlm_cli_update_pool(struct ptlrpc_request *req);

int ldlm_cli_update_pool(struct ptlrpc_request *req);

int ldlm_cli_cancel(struct lustre_handle *lockh,

int ldlm_cli_cancel(const struct lustre_handle *lockh,

		    enum ldlm_cancel_flags cancel_flags);

		    enum ldlm_cancel_flags cancel_flags);

int ldlm_cli_cancel_unused(struct ldlm_namespace *, const struct ldlm_res_id *,

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);

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -658,7 +658,7 @@ static void ldlm_add_ast_work_item(struct ldlm_lock *lock, 
 * r/w reference type is determined by \a mode

 * r/w reference type is determined by \a mode

 * Calls ldlm_lock_addref_internal.

 * Calls ldlm_lock_addref_internal.

 */

 */

void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode)

void ldlm_lock_addref(const struct lustre_handle *lockh, __u32 mode)

{

{

	struct ldlm_lock *lock;

	struct ldlm_lock *lock;
@@ -700,7 +700,7 @@ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode) 
 *

 *

 * \retval -EAGAIN lock is being canceled.

 * \retval -EAGAIN lock is being canceled.

 */

 */

int ldlm_lock_addref_try(struct lustre_handle *lockh, __u32 mode)

int ldlm_lock_addref_try(const struct lustre_handle *lockh, __u32 mode)

{

{

	struct ldlm_lock *lock;

	struct ldlm_lock *lock;

	int	       result;

	int	       result;
@@ -832,7 +832,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) 
/**

/**

 * Decrease reader/writer refcount for LDLM lock with handle \a lockh

 * Decrease reader/writer refcount for LDLM lock with handle \a lockh

 */

 */

void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode)

void ldlm_lock_decref(const struct lustre_handle *lockh, __u32 mode)

{

{

	struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);

	struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);
@@ -849,7 +849,7 @@ EXPORT_SYMBOL(ldlm_lock_decref); 
 *

 *

 * Typical usage is for GROUP locks which we cannot allow to be cached.

 * Typical usage is for GROUP locks which we cannot allow to be cached.

 */

 */

void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode)

void ldlm_lock_decref_and_cancel(const struct lustre_handle *lockh, __u32 mode)

{

{

	struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);

	struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);
@@ -1318,7 +1318,7 @@ enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, 
}

}

EXPORT_SYMBOL(ldlm_lock_match);

EXPORT_SYMBOL(ldlm_lock_match);





enum ldlm_mode ldlm_revalidate_lock_handle(struct lustre_handle *lockh,

enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,

					   __u64 *bits)

					   __u64 *bits)

{

{

	struct ldlm_lock *lock;

	struct ldlm_lock *lock;
@@ -1849,7 +1849,7 @@ EXPORT_SYMBOL(ldlm_lock_cancel); 
/**

/**

 * Set opaque data into the lock that only makes sense to upper layer.

 * Set opaque data into the lock that only makes sense to upper layer.

 */

 */

int ldlm_lock_set_data(struct lustre_handle *lockh, void *data)

int ldlm_lock_set_data(const struct lustre_handle *lockh, void *data)

{

{

	struct ldlm_lock *lock = ldlm_handle2lock(lockh);

	struct ldlm_lock *lock = ldlm_handle2lock(lockh);

	int rc = -EINVAL;

	int rc = -EINVAL;
@@ -1875,7 +1875,7 @@ struct export_cl_data { 
 *

 *

 * Used when printing all locks on a resource for debug purposes.

 * Used when printing all locks on a resource for debug purposes.

 */

 */

void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh)

void ldlm_lock_dump_handle(int level, const struct lustre_handle *lockh)

{

{

	struct ldlm_lock *lock;

	struct ldlm_lock *lock;

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -499,7 +499,7 @@ static int ldlm_handle_setinfo(struct ptlrpc_request *req) 




static inline void ldlm_callback_errmsg(struct ptlrpc_request *req,

static inline void ldlm_callback_errmsg(struct ptlrpc_request *req,

					const char *msg, int rc,

					const char *msg, int rc,

					struct lustre_handle *handle)

					const struct lustre_handle *handle)

{

{

	DEBUG_REQ((req->rq_no_reply || rc) ? D_WARNING : D_DLMTRACE, req,

	DEBUG_REQ((req->rq_no_reply || rc) ? D_WARNING : D_DLMTRACE, req,

		  "%s: [nid %s] [rc %d] [lock %#llx]",

		  "%s: [nid %s] [rc %d] [lock %#llx]",

drivers/staging/lustre/lustre/ldlm/ldlm_request.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -336,7 +336,7 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, 
			  enum ldlm_type type, __u8 with_policy,

			  enum ldlm_type type, __u8 with_policy,

			  enum ldlm_mode mode,

			  enum ldlm_mode mode,

			  __u64 *flags, void *lvb, __u32 lvb_len,

			  __u64 *flags, void *lvb, __u32 lvb_len,

			  struct lustre_handle *lockh, int rc)

			  const struct lustre_handle *lockh, int rc)

{

{

	struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;

	struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;

	int is_replay = *flags & LDLM_FL_REPLAY;

	int is_replay = *flags & LDLM_FL_REPLAY;
@@ -1023,7 +1023,7 @@ EXPORT_SYMBOL(ldlm_cli_update_pool); 
 *

 *

 * Lock must not have any readers or writers by this time.

 * Lock must not have any readers or writers by this time.

 */

 */

int ldlm_cli_cancel(struct lustre_handle *lockh,

int ldlm_cli_cancel(const struct lustre_handle *lockh,

		    enum ldlm_cancel_flags cancel_flags)

		    enum ldlm_cancel_flags cancel_flags)

{

{

	struct obd_export *exp;

	struct obd_export *exp;