locks: Use more file_inode and fix a comment
Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
This commit is contained in:
Родитель
128a378522
Коммит
6ca7d91012
|
@ -1718,8 +1718,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
|
|||
{
|
||||
int error = -EAGAIN;
|
||||
struct file_lock *fl, *victim = NULL;
|
||||
struct dentry *dentry = filp->f_path.dentry;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct file_lock_context *ctx;
|
||||
LIST_HEAD(dispose);
|
||||
|
||||
|
@ -1759,8 +1758,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
|
|||
int generic_setlease(struct file *filp, long arg, struct file_lock **flp,
|
||||
void **priv)
|
||||
{
|
||||
struct dentry *dentry = filp->f_path.dentry;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
int error;
|
||||
|
||||
if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CAP_LEASE))
|
||||
|
@ -2115,7 +2113,7 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd,
|
|||
return error;
|
||||
}
|
||||
|
||||
/* Ensure that fl->fl_filp has compatible f_mode for F_SETLK calls */
|
||||
/* Ensure that fl->fl_file has compatible f_mode for F_SETLK calls */
|
||||
static int
|
||||
check_fmode_for_setlk(struct file_lock *fl)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче