summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Layton <jeff.layton@primarydata.com>2015-01-21 20:44:01 -0500
committerJeff Layton <jeff.layton@primarydata.com>2015-01-21 20:44:01 -0500
commit8116bf4cb62d337c953cfa5369ef4cf83e73140c (patch)
tree8feb67e4e034365d84fcf59c397f2e2b2867c68b /include
parent3d8e560de4a076b302cb0cc17e998aaace2b176a (diff)
downloadop-kernel-dev-8116bf4cb62d337c953cfa5369ef4cf83e73140c.zip
op-kernel-dev-8116bf4cb62d337c953cfa5369ef4cf83e73140c.tar.gz
locks: update comments that refer to inode->i_flock
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f87cb2f..ddd2fa7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -925,12 +925,11 @@ int locks_in_grace(struct net *);
* FIXME: should we create a separate "struct lock_request" to help distinguish
* these two uses?
*
- * The i_flock list is ordered by:
+ * The varous i_flctx lists are ordered by:
*
- * 1) lock type -- FL_LEASEs first, then FL_FLOCK, and finally FL_POSIX
- * 2) lock owner
- * 3) lock range start
- * 4) lock range end
+ * 1) lock owner
+ * 2) lock range start
+ * 3) lock range end
*
* Obviously, the last two criteria only matter for POSIX locks.
*/
@@ -1992,8 +1991,9 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
{
/*
* Since this check is lockless, we must ensure that any refcounts
- * taken are done before checking inode->i_flock. Otherwise, we could
- * end up racing with tasks trying to set a new lease on this file.
+ * taken are done before checking i_flctx->flc_lease. Otherwise, we
+ * could end up racing with tasks trying to set a new lease on this
+ * file.
*/
smp_mb();
if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease))
@@ -2005,8 +2005,9 @@ static inline int break_deleg(struct inode *inode, unsigned int mode)
{
/*
* Since this check is lockless, we must ensure that any refcounts
- * taken are done before checking inode->i_flock. Otherwise, we could
- * end up racing with tasks trying to set a new lease on this file.
+ * taken are done before checking i_flctx->flc_lease. Otherwise, we
+ * could end up racing with tasks trying to set a new lease on this
+ * file.
*/
smp_mb();
if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease))
OpenPOWER on IntegriCloud