Attachment 150387 Details for Bug 232949 – Proposed patch

[patch] Proposed patch

lock.performance.patch (text/plain), 2.70 KB, created by Robert Peterson on 2007-03-19 16:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-03-19 16:20:59 UTC

Size: 2.70 KB

patch

obsolete

>Index: lock.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs-kernel/src/dlm/Attic/lock.c,v
>retrieving revision 1.15.2.8
>diff -w -u -p -p -u -r1.15.2.8 lock.c
>--- lock.c	3 Jan 2007 16:10:28 -0000	1.15.2.8
>+++ lock.c	19 Mar 2007 16:18:28 -0000
>@@ -239,7 +239,7 @@ static unsigned int make_flags(dlm_lock_
>  *
>  */
> 
>-static __inline__ void make_strname(struct lm_lockname *lockname,
>+static __inline__ void make_strname(const struct lm_lockname *lockname,
> 				    strname_t *str)
> {
> 	sprintf(str->name, "%8x%16"PRIx64, lockname->ln_type,
>@@ -257,6 +257,7 @@ int create_lp(dlm_t *dlm, struct lm_lock
> 
> 	memset(lp, 0, sizeof(dlm_lock_t));
> 	lp->lockname = *name;
>+	make_strname(name, &lp->str);
> 	lp->dlm = dlm;
> 	lp->cur = DLM_LOCK_IV;
> 	lp->lvb = NULL;
>@@ -372,7 +373,6 @@ void do_dlm_unlock_sync(dlm_lock_t *lp)
> void do_dlm_lock(dlm_lock_t *lp, struct dlm_range *range)
> {
> 	dlm_t *dlm = lp->dlm;
>-	strname_t str;
> 	int error, bast = 1;
> 
> 	/*
>@@ -405,8 +405,6 @@ void do_dlm_lock(dlm_lock_t *lp, struct 
> 	if (lp->posix || test_bit(LFL_NOBAST, &lp->flags))
> 		bast = 0;
> 
>-	make_strname(&lp->lockname, &str);
>-
> 	set_bit(LFL_WAIT_COMPLETE, &lp->flags);
> 
> 	/*
>@@ -415,9 +413,9 @@ void do_dlm_lock(dlm_lock_t *lp, struct 
> 		  lp->cur, lp->req, lp->lkf);
> 	*/
> 
>-	error = dlm_lock(dlm->gdlm_lsp, lp->req, &lp->lksb, lp->lkf, str.name,
>-			  str.namelen, 0, lock_ast, (void *) lp,
>-			  bast ? lock_bast : NULL, range);
>+	error = dlm_lock(dlm->gdlm_lsp, lp->req, &lp->lksb, lp->lkf, 
>+			 lp->str.name, lp->str.namelen, 0, lock_ast, 
>+			 (void *) lp, bast ? lock_bast : NULL, range);
> 
> 	if ((error == -EAGAIN) && (lp->lkf & DLM_LKF_NOQUEUE)) {
> 		lp->lksb.sb_status = -EAGAIN;
>Index: lock_dlm.h
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs-kernel/src/dlm/Attic/lock_dlm.h,v
>retrieving revision 1.18.2.6
>diff -w -u -p -p -u -r1.18.2.6 lock_dlm.h
>--- lock_dlm.h	8 Dec 2006 17:27:37 -0000	1.18.2.6
>+++ lock_dlm.h	19 Mar 2007 16:18:28 -0000
>@@ -78,6 +78,11 @@ typedef struct strname strname_t;
> #define DFL_OTHERSMAYMOUNT	11
> #define DFL_WAIT_OTHERSMAYMOUNT	12
> 
>+struct strname {
>+	unsigned char		name[LOCK_DLM_STRNAME_BYTES];
>+	unsigned short		namelen;
>+};
>+
> struct dlm {
> 	uint32_t		jid;
> 	uint32_t		our_nodeid;
>@@ -176,6 +181,7 @@ struct posix_lock {
> struct dlm_lock {
> 	dlm_t *			dlm;
> 	struct lm_lockname	lockname;
>+	strname_t		str;
> 	char *			lvb;
> 	struct dlm_lksb		lksb;
> 
>@@ -219,11 +225,6 @@ struct dlm_node {
> #define QUEUE_ERROR_LOCK        3
> #define QUEUE_ERROR_RETRY       4
> 
>-struct strname {
>-	unsigned char		name[LOCK_DLM_STRNAME_BYTES];
>-	unsigned short		namelen;
>-};
>-
> struct dlm_start {
> 	uint32_t *		nodeids;
> 	int			count;

Actions: View | Diff

Attachments on bug 232949: 150387 | 151291