summaryrefslogtreecommitdiff
path: root/fs/gfs2/glock.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-11-08 10:26:54 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-11-30 10:34:43 -0500
commit2ca99501fa5422e84f18333918a503433449e2b5 (patch)
tree46bdb25c3be5bdc4e4c80b30a99dd3811f2ee1c0 /fs/gfs2/glock.h
parentc594d8866460a2710c436839d79f334a0714a2a7 (diff)
[GFS2] Fix page lock/glock deadlock
This fixes a race between the glock and the page lock encountered during truncate in gfs2_readpage and gfs2_prepare_write. The gfs2_readpages function doesn't need the same fix since it only uses a try lock anyway, so it will fail back to gfs2_readpage in the case of a potential deadlock. This bug was spotted by Russell Cattelan. Cc: Russell Cattelan <cattelan@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/glock.h')
-rw-r--r--fs/gfs2/glock.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index b9856274df59..a331bf8175ea 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -27,7 +27,6 @@
#define GL_ATIME 0x00000200
#define GL_NOCACHE 0x00000400
#define GL_NOCANCEL 0x00001000
-#define GL_AOP 0x00004000
#define GLR_TRYFAILED 13
#define GLR_CANCELED 14