p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

locks: update comments that refer to inode->i_flock 

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
This commit is contained in:
Jeff Layton 2015-01-21 20:44:01 -05:00
parent 3d8e560de4
commit 8116bf4cb6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/locks.c
View File

@ -2212,7 +2212,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,
*/ */
/* /*
* we need that spin_lock here - it prevents reordering between * we need that spin_lock here - it prevents reordering between
* update of inode->i_flock and check for it done in close(). * update of i_flctx->flc_posix and check for it done in close().
* rcu_read_lock() wouldn't do. * rcu_read_lock() wouldn't do.
*/ */
spin_lock(&current->files->file_lock); spin_lock(&current->files->file_lock);

19
include/linux/fs.h
View File

@ -925,12 +925,11 @@ int locks_in_grace(struct net *);
* FIXME: should we create a separate "struct lock_request" to help distinguish * FIXME: should we create a separate "struct lock_request" to help distinguish
* these two uses? * 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 * 1) lock owner
* 2) lock owner * 2) lock range start
* 3) lock range start * 3) lock range end
* 4) lock range end
* *
* Obviously, the last two criteria only matter for POSIX locks. * 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 * Since this check is lockless, we must ensure that any refcounts
* taken are done before checking inode->i_flock. Otherwise, we could * taken are done before checking i_flctx->flc_lease. Otherwise, we
* end up racing with tasks trying to set a new lease on this file. * could end up racing with tasks trying to set a new lease on this
* file.
*/ */
smp_mb(); smp_mb();
if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease)) 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 * Since this check is lockless, we must ensure that any refcounts
* taken are done before checking inode->i_flock. Otherwise, we could * taken are done before checking i_flctx->flc_lease. Otherwise, we
* end up racing with tasks trying to set a new lease on this file. * could end up racing with tasks trying to set a new lease on this
* file.
*/ */
smp_mb(); smp_mb();
if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease)) if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease))