OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

locks: have locks_release_file use flock_lock_file to release generic flock locks 

...instead of open-coding it and removing flock locks directly. This
helps consolidate the flock lock removal logic into a single spot.

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
This commit is contained in:
Jeff Layton 2015-01-16 15:05:54 -05:00
parent 6dee60f69d
commit dd459bb197
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/locks.c
View File

@ -2360,6 +2360,30 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner)
EXPORT_SYMBOL(locks_remove_posix); EXPORT_SYMBOL(locks_remove_posix);
static void
locks_remove_flock(struct file *filp)
{
struct file_lock fl = {
.fl_owner = filp,
.fl_pid = current->tgid,
.fl_file = filp,
.fl_flags = FL_FLOCK,
.fl_type = F_UNLCK,
.fl_end = OFFSET_MAX,
};
if (!file_inode(filp)->i_flock)
return;
if (filp->f_op->flock)
filp->f_op->flock(filp, F_SETLKW, &fl);
else
flock_lock_file(filp, &fl);
if (fl.fl_ops && fl.fl_ops->fl_release_private)
fl.fl_ops->fl_release_private(&fl);
}
/* /*
* This function is called on the last close of an open file. * This function is called on the last close of an open file.
*/ */
@ -2370,24 +2394,14 @@ void locks_remove_file(struct file *filp)
struct file_lock **before; struct file_lock **before;
LIST_HEAD(dispose); LIST_HEAD(dispose);
if (!inode->i_flock) /* remove any OFD locks */
return;
locks_remove_posix(filp, filp); locks_remove_posix(filp, filp);
if (filp->f_op->flock) { /* remove flock locks */
struct file_lock fl = { locks_remove_flock(filp);
.fl_owner = filp,
.fl_pid = current->tgid, if (!inode->i_flock)
.fl_file = filp, return;
.fl_flags = FL_FLOCK,
.fl_type = F_UNLCK,
.fl_end = OFFSET_MAX,
};
filp->f_op->flock(filp, F_SETLKW, &fl);
if (fl.fl_ops && fl.fl_ops->fl_release_private)
fl.fl_ops->fl_release_private(&fl);
}
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
before = &inode->i_flock; before = &inode->i_flock;
@ -2407,8 +2421,7 @@ void locks_remove_file(struct file *filp)
* some info about it and then just remove it from * some info about it and then just remove it from
* the list. * the list.
*/ */
WARN(!IS_FLOCK(fl), WARN(1, "leftover lock: dev=%u:%u ino=%lu type=%hhd flags=0x%x start=%lld end=%lld\n",
"leftover lock: dev=%u:%u ino=%lu type=%hhd flags=0x%x start=%lld end=%lld\n",
MAJOR(inode->i_sb->s_dev), MAJOR(inode->i_sb->s_dev),
MINOR(inode->i_sb->s_dev), inode->i_ino, MINOR(inode->i_sb->s_dev), inode->i_ino,
fl->fl_type, fl->fl_flags, fl->fl_type, fl->fl_flags,