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

Commit 34a60457 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman
Browse files

staging: lustre: mdc: handle IT_READDIR operations 



The readdir operations lock was incomplete. This
patch fills in the missing pieces.

Signed-off-by: default avatarwang di <di.wang@intel.com>
Reviewed-on: http://review.whamcloud.com/7043
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3531


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@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 8e9dfe8a

drivers/staging/lustre/lustre/include/obd.h

+3 −1
Original line number Diff line number Diff line
@@ -801,9 +801,11 @@ static inline int it_to_lock_mode(struct lookup_intent *it) 
	/* CREAT needs to be tested before open (both could be set) */

	if (it->it_op & IT_CREAT)

		return LCK_CW;

	else if (it->it_op & (IT_READDIR | IT_GETATTR | IT_OPEN | IT_LOOKUP |

	else if (it->it_op & (IT_GETATTR | IT_OPEN | IT_LOOKUP |

			      IT_LAYOUT))

		return LCK_CR;

	else if (it->it_op & IT_READDIR)

		return LCK_PR;

	else if (it->it_op &  IT_GETXATTR)

		return LCK_PR;

	else if (it->it_op &  IT_SETXATTR)

drivers/staging/lustre/lustre/mdc/mdc_locks.c

+7 −1
Original line number Diff line number Diff line
@@ -903,6 +903,9 @@ static int mdc_finish_intent_lock(struct obd_export *exp, 
	LASSERT(request != LP_POISON);

	LASSERT(request->rq_repmsg != LP_POISON);



	if (it->it_op & IT_READDIR)

		return 0;



	if (!it_disposition(it, DISP_IT_EXECD)) {

		/* The server failed before it even started executing the

		 * intent, i.e. because it couldn't unpack the request.
@@ -1042,6 +1045,9 @@ int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it, 
						  MDS_INODELOCK_LOOKUP |

						  MDS_INODELOCK_PERM;

			break;

		case IT_READDIR:

			policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;

			break;

		case IT_LAYOUT:

			policy.l_inodebits.bits = MDS_INODELOCK_LAYOUT;

			break;
@@ -1119,7 +1125,7 @@ int mdc_intent_lock(struct obd_export *exp, struct md_op_data *op_data, 


	lockh.cookie = 0;

	if (fid_is_sane(&op_data->op_fid2) &&

	    (it->it_op & (IT_LOOKUP | IT_GETATTR))) {

	    (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_READDIR))) {

		/* We could just return 1 immediately, but since we should only

		 * be called in revalidate_it if we already have a lock, let's

		 * verify that.