mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
[PATCH] VFS: Ensure that all the on-stack struct file_lock call fl_release_private
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
3da28eb1c6
commit
80fec4c62e
1 changed files with 6 additions and 0 deletions
|
@ -1548,6 +1548,8 @@ int fcntl_getlk(struct file *filp, struct flock __user *l)
|
|||
|
||||
if (filp->f_op && filp->f_op->lock) {
|
||||
error = filp->f_op->lock(filp, F_GETLK, &file_lock);
|
||||
if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
|
||||
file_lock.fl_ops->fl_release_private(&file_lock);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
else
|
||||
|
@ -1690,6 +1692,8 @@ int fcntl_getlk64(struct file *filp, struct flock64 __user *l)
|
|||
|
||||
if (filp->f_op && filp->f_op->lock) {
|
||||
error = filp->f_op->lock(filp, F_GETLK, &file_lock);
|
||||
if (file_lock.fl_ops && file_lock.fl_ops->fl_release_private)
|
||||
file_lock.fl_ops->fl_release_private(&file_lock);
|
||||
if (error < 0)
|
||||
goto out;
|
||||
else
|
||||
|
@ -1873,6 +1877,8 @@ void locks_remove_flock(struct file *filp)
|
|||
.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);
|
||||
}
|
||||
|
||||
lock_kernel();
|
||||
|
|
Loading…
Reference in a new issue