public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: fabbione@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. gfs-kernel_0_1_22-173-g4ecbd5d Date: Wed, 16 Apr 2008 03:46:00 -0000 [thread overview] Message-ID: <20080416034647.29380.qmail@sourceware.org> (raw) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4ecbd5d63ff454ed232661a644194ae858ea1830 The branch, master has been updated via 4ecbd5d63ff454ed232661a644194ae858ea1830 (commit) via 73a341b9ba39c6c61ce9248ac74648dfe90b6c9c (commit) from ebda3b163cabd4e0f04127637ed73caf9caf2704 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4ecbd5d63ff454ed232661a644194ae858ea1830 Author: jparsons <jparsons@redhat.com> Date: Tue Apr 15 18:21:28 2008 -0400 Bump MAX_DEVICES in fenced from 4 to 8 Addresses request in rhbz#284701 commit 73a341b9ba39c6c61ce9248ac74648dfe90b6c9c Author: David Teigland <teigland@redhat.com> Date: Mon Mar 31 10:09:37 2008 -0500 gfs: don't cancel glocks when writing to hidden file bz 438268 When glock.c sees the PRIORITY flag, it cancels any outstanding glocks prior to doing the lock request. lock_dlm also uses the PRIORITY flag to give give granting priority to the lock in the dlm. Both of these are necessary when the PRIORITY glock is used for recovery, but only the second is wanted (neither is really needed) when writing to a hidden file. A new GL_NOCANCEL_OTHER flag, combined with PRIORITY, is used to tell glock.c to not do the cancels. Signed-off-by: David Teigland <teigland@redhat.com> ----------------------------------------------------------------------- Summary of changes: fence/fenced/agent.c | 2 +- gfs-kernel/src/gfs/glock.c | 3 ++- gfs-kernel/src/gfs/glock.h | 1 + gfs-kernel/src/gfs/ioctl.c | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c index 1bb9f12..3207fe3 100644 --- a/fence/fenced/agent.c +++ b/fence/fenced/agent.c @@ -27,7 +27,7 @@ #include "ccs.h" #define MAX_METHODS 8 -#define MAX_DEVICES 4 +#define MAX_DEVICES 8 #define MAX_AGENT_ARGS_LEN 512 #define METHOD_NAME_PATH "/cluster/clusternodes/clusternode[@name=\"%s\"]/fence/method[%d]/@name" diff --git a/gfs-kernel/src/gfs/glock.c b/gfs-kernel/src/gfs/glock.c index f112f5f..f4ceaed 100644 --- a/gfs-kernel/src/gfs/glock.c +++ b/gfs-kernel/src/gfs/glock.c @@ -1336,7 +1336,8 @@ glock_wait_internal(struct gfs_holder *gh) spin_unlock(&gl->gl_spin); } - if (gh->gh_flags & LM_FLAG_PRIORITY) + if ((gh->gh_flags & LM_FLAG_PRIORITY) && + !(gh->gh_flags & GL_NOCANCEL_OTHER)) do_cancels(gh); wait_for_completion(&gh->gh_wait); diff --git a/gfs-kernel/src/gfs/glock.h b/gfs-kernel/src/gfs/glock.h index fb1e210..c9bd819 100644 --- a/gfs-kernel/src/gfs/glock.h +++ b/gfs-kernel/src/gfs/glock.h @@ -34,6 +34,7 @@ #define GL_SYNC (0x00000800) /* Sync to disk when no more holders */ #define GL_NOCANCEL (0x00001000) /* Don't ever cancel this request */ #define GL_READPAGE (0x00002000) /* gfs_readpage() issued this lock request */ +#define GL_NOCANCEL_OTHER (0x00004000) /* Don't cancel other locks for this */ #define GLR_TRYFAILED (13) #define GLR_CANCELED (14) diff --git a/gfs-kernel/src/gfs/ioctl.c b/gfs-kernel/src/gfs/ioctl.c index 1133c8f..32db45c 100644 --- a/gfs-kernel/src/gfs/ioctl.c +++ b/gfs-kernel/src/gfs/ioctl.c @@ -1223,7 +1223,8 @@ gi_do_hfile_write(struct gfs_sbd *sdp, struct gfs_ioctl *gi, int from_user) gfs_write_calc_reserv(ip, gi->gi_size, &data_blocks, &ind_blocks); error = gfs_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, - LM_FLAG_PRIORITY | GL_SYNC, &i_gh); + LM_FLAG_PRIORITY | GL_SYNC | GL_NOCANCEL_OTHER, + &i_gh); if (error) return error; hooks/post-receive -- Cluster Project
reply other threads:[~2008-04-16 3:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080416034647.29380.qmail@sourceware.org \ --to=fabbione@sourceware.org \ --cc=cluster-cvs@sources.redhat.com \ --cc=cluster-devel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).