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

Commit d7696405 authored by Bruce Korb's avatar Bruce Korb Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: clean up l_flags 



Remove the now obsolete LDLM_AST_FLAGS and LDLM_INHERIT_FLAGS defines.
Remove the obsolete LDLM_FL_HIDE_LOCK_MASK define.
Rename "local_only" mask to "off_wire" since it is confusingly similar
to a flag that (I think) means, "do not copy this lock over the wire."

Signed-off-by: default avatarBruce Korb <bruce.korb@gmail.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2906


Reviewed-by: default avatarKeith Mannthey <Keith.Mannthey@intel.com>
Reviewed-on: http://review.whamcloud.com/7963


Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a9a80ba

drivers/staging/lustre/lustre/include/lustre_dlm_flags.h

+2 −14
Original line number Diff line number Diff line
@@ -37,17 +37,11 @@ 
/** l_flags bits marked as "gone" bits */

#define LDLM_FL_GONE_MASK               0x0006004000000000ULL



/** l_flags bits marked as "hide_lock" bits */

#define LDLM_FL_HIDE_LOCK_MASK          0x0000206400000000ULL



/** l_flags bits marked as "inherit" bits */

#define LDLM_FL_INHERIT_MASK            0x0000000000800000ULL



/** l_flags bits marked as "local_only" bits */

#define LDLM_FL_LOCAL_ONLY_MASK         0x00FFFFFF00000000ULL



/** l_flags bits marked as "on_wire" bits */

#define LDLM_FL_ON_WIRE_MASK            0x00000000C08F932FULL

/** l_flags bits marked as "off_wire" bits */

#define LDLM_FL_OFF_WIRE_MASK           0x00FFFFFF00000000ULL



/** extent, mode, or resource changed */

#define LDLM_FL_LOCK_CHANGED            0x0000000000000001ULL /* bit 0 */
@@ -390,12 +384,6 @@ 
/** clear a ldlm_lock flag bit */

#define LDLM_CLEAR_FLAG(_l, _b)       ((_l)->l_flags &= ~(_b))



/** Mask of flags inherited from parent lock when doing intents. */

#define LDLM_INHERIT_FLAGS            LDLM_FL_INHERIT_MASK



/** Mask of Flags sent in AST lock_flags to map into the receiving lock. */

#define LDLM_AST_FLAGS                LDLM_FL_AST_MASK



/** @} subgroup */

/** @} group */

#ifdef WIRESHARK_COMPILE

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

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) 
	/* Copy hints/flags (e.g. LDLM_FL_DISCARD_DATA) from AST. */

	lock_res_and_lock(lock);

	lock->l_flags |= ldlm_flags_from_wire(dlm_req->lock_flags &

					      LDLM_AST_FLAGS);

					      LDLM_FL_AST_MASK);

	if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) {

		/* If somebody cancels lock and cache is already dropped,

		 * or lock is failed before cp_ast received on client,

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

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, 


	*flags = ldlm_flags_from_wire(reply->lock_flags);

	lock->l_flags |= ldlm_flags_from_wire(reply->lock_flags &

					      LDLM_INHERIT_FLAGS);

					      LDLM_FL_INHERIT_MASK);

	/* move NO_TIMEOUT flag to the lock to force ldlm_lock_match()

	 * to wait with no timeout as well

	 */