summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorKen Preslan <kpreslan@redhat.com>2004-09-07 17:50:11 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-07 17:50:11 -0700
commit22141f0513da328f8f4e405953e5e52fb7c4e65a (patch)
treeebaa56d878ec10506714ab5765bf07648d1432f2 /include/linux
parentc1b76a2b004bbba387a7c6d26b29434a905bc058 (diff)
[PATCH] Allow cluster-wide flock
Below is a patch that lets a cluster filesystem (such as GFS) implement flock across the cluster. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 68d486024d56..861be6705127 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -695,6 +695,7 @@ extern int posix_lock_file_wait(struct file *, struct file_lock *);
extern void posix_block_lock(struct file_lock *, struct file_lock *);
extern void posix_unblock_lock(struct file *, struct file_lock *);
extern int posix_locks_deadlock(struct file_lock *, struct file_lock *);
+extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
extern int __break_lease(struct inode *inode, unsigned int flags);
extern void lease_get_mtime(struct inode *, struct timespec *time);
extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
@@ -912,6 +913,7 @@ struct file_operations {
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int);
int (*dir_notify)(struct file *filp, unsigned long arg);
+ int (*flock) (struct file *, int, struct file_lock *);
};
struct inode_operations {