From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12065 invoked by alias); 15 Apr 2008 18:05:16 -0000 Received: (qmail 12033 invoked by uid 9453); 15 Apr 2008 18:05:16 -0000 Date: Tue, 15 Apr 2008 18:05:00 -0000 Message-ID: <20080415180516.12017.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.00-12-g86a728d X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: c6bb7557e85b3363ff0fd10f1411373f4b747366 X-Git-Newrev: 86a728d286e95b6db8a46ecd8c9b9a6540d2b138 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00101.txt.bz2 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=86a728d286e95b6db8a46ecd8c9b9a6540d2b138 The branch, STABLE2 has been updated via 86a728d286e95b6db8a46ecd8c9b9a6540d2b138 (commit) from c6bb7557e85b3363ff0fd10f1411373f4b747366 (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 86a728d286e95b6db8a46ecd8c9b9a6540d2b138 Author: David Teigland 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 ----------------------------------------------------------------------- Summary of changes: gfs-kernel/src/gfs/glock.c | 3 ++- gfs-kernel/src/gfs/glock.h | 1 + gfs-kernel/src/gfs/ioctl.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) 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