@@ -925,12 +925,11 @@ int locks_in_grace(struct net *);
925925 * FIXME: should we create a separate "struct lock_request" to help distinguish
926926 * these two uses?
927927 *
928- * The i_flock list is ordered by:
928+ * The varous i_flctx lists are ordered by:
929929 *
930- * 1) lock type -- FL_LEASEs first, then FL_FLOCK, and finally FL_POSIX
931- * 2) lock owner
932- * 3) lock range start
933- * 4) lock range end
930+ * 1) lock owner
931+ * 2) lock range start
932+ * 3) lock range end
934933 *
935934 * Obviously, the last two criteria only matter for POSIX locks.
936935 */
@@ -1992,8 +1991,9 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
19921991{
19931992 /*
19941993 * Since this check is lockless, we must ensure that any refcounts
1995- * taken are done before checking inode->i_flock. Otherwise, we could
1996- * end up racing with tasks trying to set a new lease on this file.
1994+ * taken are done before checking i_flctx->flc_lease. Otherwise, we
1995+ * could end up racing with tasks trying to set a new lease on this
1996+ * file.
19971997 */
19981998 smp_mb ();
19991999 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)
20052005{
20062006 /*
20072007 * Since this check is lockless, we must ensure that any refcounts
2008- * taken are done before checking inode->i_flock. Otherwise, we could
2009- * end up racing with tasks trying to set a new lease on this file.
2008+ * taken are done before checking i_flctx->flc_lease. Otherwise, we
2009+ * could end up racing with tasks trying to set a new lease on this
2010+ * file.
20102011 */
20112012 smp_mb ();
20122013 if (inode -> i_flctx && !list_empty_careful (& inode -> i_flctx -> flc_lease ))
0 commit comments