Attachment 299022 Details for Bug 438268 – patch to try

patch to try

nocancel-other.patch (text/plain), 1.51 KB, created by David Teigland on 2008-03-25 13:41:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Teigland

Created: 2008-03-25 13:41:19 UTC

Size: 1.51 KB

patch

obsolete

>diff --git a/gfs-kernel/src/gfs/glock.c b/gfs-kernel/src/gfs/glock.c
>index 255994c..1cb6e7e 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 37630b0..f6e6ef3 100644
>--- a/gfs-kernel/src/gfs/glock.h
>+++ b/gfs-kernel/src/gfs/glock.h
>@@ -33,6 +33,7 @@
> #define GL_NOCACHE        (0x00000400) /* Release glock when done, don't cache */
> #define GL_SYNC           (0x00000800) /* Sync to disk when no more holders */
> #define GL_NOCANCEL       (0x00001000) /* Don't ever cancel this request */
>+#define GL_NOCANCEL_OTHER (0x00002000) /* 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;
>

Actions: View

Attachments on bug 438268: 298706 | 299022