The patch titled
locks: add lock cancel command
has been removed from the -mm tree. Its filename was
locks-add-lock-cancel-command.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: locks: add lock cancel command
From: Marc Eshel <eshel@xxxxxxxxxxxxxxx> - unquoted
Lock managers need to be able to cancel pending lock requests. In the case
where the exported filesystem manages its own locks, it's not sufficient just
to call posix_unblock_lock(); we need to let the filesystem know what's
happening too.
We do this by adding a new fcntl lock command: FL_CANCELLK. Some day this
might also be made available to userspace applications that could benefit from
an asynchronous locking api.
Signed-off-by: "J. Bruce Fields" <bfields@xxxxxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxx>
Cc: Marc Eshel <eshel@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/locks.c | 17 +++++++++++++++++
include/linux/fcntl.h | 4 ++++
include/linux/fs.h | 1 +
3 files changed, 22 insertions(+)
diff -puN fs/locks.c~locks-add-lock-cancel-command fs/locks.c
--- a/fs/locks.c~locks-add-lock-cancel-command
+++ a/fs/locks.c
@@ -2041,6 +2041,23 @@ posix_unblock_lock(struct file *filp, st
EXPORT_SYMBOL(posix_unblock_lock);
+/**
+ * vfs_cancel_lock - file byte range unblock lock
+ * @filp: The file to apply the unblock to
+ * @fl: The lock to be unblocked
+ *
+ * Used by lock managers to cancel blocked requests
+ */
+int vfs_cancel_lock(struct file *filp, struct file_lock *fl)
+{
+ if (filp->f_op && filp->f_op->lock)
+ return filp->f_op->lock(filp, F_CANCELLK, fl);
+ else
+ return posix_unblock_lock(filp, fl);
+}
+
+EXPORT_SYMBOL_GPL(vfs_cancel_lock);
+
static void lock_get_status(char* out, struct file_lock *fl, int id, char *pfx)
{
struct inode *inode = NULL;
diff -puN include/linux/fcntl.h~locks-add-lock-cancel-command include/linux/fcntl.h
--- a/include/linux/fcntl.h~locks-add-lock-cancel-command
+++ a/include/linux/fcntl.h
@@ -3,6 +3,10 @@
#include <asm/fcntl.h>
+/* Cancel a blocking posix lock; internal use only until we expose an
+ * asynchronous lock api to userspace: */
+#define F_CANCELLK (F_LINUX_SPECIFIC_BASE+5)
+
#define F_SETLEASE (F_LINUX_SPECIFIC_BASE+0)
#define F_GETLEASE (F_LINUX_SPECIFIC_BASE+1)
diff -puN include/linux/fs.h~locks-add-lock-cancel-command include/linux/fs.h
--- a/include/linux/fs.h~locks-add-lock-cancel-command
+++ a/include/linux/fs.h
@@ -860,6 +860,7 @@ extern int posix_lock_file_wait(struct f
extern int posix_unblock_lock(struct file *, struct file_lock *);
extern int vfs_test_lock(struct file *, struct file_lock *);
extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *);
+extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
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);
_
Patches currently in -mm which might be from eshel@xxxxxxxxxxxxxxx are
git-nfs-server-cluster-locking-api.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
