aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMarc Eshel <eshel@almaden.ibm.com>2006-12-05 23:31:28 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2007-05-06 20:38:49 -0400
commit2beb6614f5e36c6165b704c167d82ef3e4ceaa0c (patch)
tree7c5c1277f139c754d7b73a1822016574de655bd6 /fs
parentfd85b8170dabbf021987875ef7f903791f4f181e (diff)
locks: add fl_grant callback for asynchronous lock return
Acquiring a lock on a cluster filesystem may require communication with remote hosts, and to avoid blocking lockd or nfsd threads during such communication, we allow the results to be returned asynchronously. When a ->lock() call needs to block, the file system will return -EINPROGRESS, and then later return the results with a call to the routine in the fl_grant field of the lock_manager_operations struct. This differs from the case when ->lock returns -EAGAIN to a blocking lock request; in that case, the filesystem calls fl_notify when the lock is granted, and the caller retries the original lock. So while fl_notify is merely a hint to the caller that it should retry, fl_grant actually communicates the final result of the lock operation (with the lock already acquired in the succesful case). Therefore fl_grant takes a lock, a status and, for the test lock case, a conflicting lock. We also allow fl_grant to return an error to the filesystem, to handle the case where the fl_grant requests arrives after the lock manager has already given up waiting for it. Signed-off-by: Marc Eshel <eshel@almaden.ibm.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/locks.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 242328e17f32..53b0cd153202 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1698,6 +1698,25 @@ out:
1698 * If the filesystem defines a private ->lock() method, then @conf will 1698 * If the filesystem defines a private ->lock() method, then @conf will
1699 * be left unchanged; so a caller that cares should initialize it to 1699 * be left unchanged; so a caller that cares should initialize it to
1700 * some acceptable default. 1700 * some acceptable default.
1701 *
1702 * To avoid blocking kernel daemons, such as lockd, that need to acquire POSIX
1703 * locks, the ->lock() interface may return asynchronously, before the lock has
1704 * been granted or denied by the underlying filesystem, if (and only if)
1705 * fl_grant is set. Callers expecting ->lock() to return asynchronously
1706 * will only use F_SETLK, not F_SETLKW; they will set FL_SLEEP if (and only if)
1707 * the request is for a blocking lock. When ->lock() does return asynchronously,
1708 * it must return -EINPROGRESS, and call ->fl_grant() when the lock
1709 * request completes.
1710 * If the request is for non-blocking lock the file system should return
1711 * -EINPROGRESS then try to get the lock and call the callback routine with
1712 * the result. If the request timed out the callback routine will return a
1713 * nonzero return code and the file system should release the lock. The file
1714 * system is also responsible to keep a corresponding posix lock when it
1715 * grants a lock so the VFS can find out which locks are locally held and do
1716 * the correct lock cleanup when required.
1717 * The underlying filesystem must not drop the kernel lock or call
1718 * ->fl_grant() before returning to the caller with a -EINPROGRESS
1719 * return code.
1701 */ 1720 */
1702int vfs_lock_file(struct file *filp, unsigned int cmd, struct file_lock *fl, struct file_lock *conf) 1721int vfs_lock_file(struct file *filp, unsigned int cmd, struct file_lock *fl, struct file_lock *conf)
1703{ 1722{