summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/glock.h
diff options
context:
space:
mode:
authorAbhijith Das <adas@redhat.com>2007-09-14 06:35:27 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 09:56:14 +0200
commitb4c20166dcfca106f0f416bfce200099ed76ab18 (patch)
tree474e8c3bda161953202793c0801ab00a5b5433de /fs/gfs2/glock.h
parent[GFS2] Clean up gfs2_trans_add_revoke() (diff)
downloadlinux-b4c20166dcfca106f0f416bfce200099ed76ab18.tar.xz
linux-b4c20166dcfca106f0f416bfce200099ed76ab18.zip
[GFS2] flocks from same process trip kernel BUG at fs/gfs2/glock.c:1118!
This patch adds a new flag to the gfs2_holder structure GL_FLOCK. It is set on holders of glocks representing flocks. This flag is checked in add_to_queue() and a process is permitted to queue more than one holder onto a glock if it is set. This solves the issue of a process not being able to do multiple flocks on the same file. Through a single descriptor, a process can now promote and demote flocks. Through multiple descriptors a process can now queue multiple flocks on the same file. There's still the problem of a process deadlocking itself (because gfs2 blocking locks are not interruptible) by queueing incompatible deadlock. Signed-off-by: Abhijith Das <adas@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, 1 insertions, 0 deletions
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index f7a8e626aa08..b16f604eea9f 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -26,6 +26,7 @@
#define GL_SKIP 0x00000100
#define GL_ATIME 0x00000200
#define GL_NOCACHE 0x00000400
+#define GL_FLOCK 0x00000800
#define GL_NOCANCEL 0x00001000
#define GLR_TRYFAILED 13