Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca7d910 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Jeff Layton
Browse files

locks: Use more file_inode and fix a comment 



Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
parent 128a3785

fs/locks.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -1718,8 +1718,7 @@ static int generic_delete_lease(struct file *filp, void *owner) 
{

{

	int error = -EAGAIN;

	int error = -EAGAIN;

	struct file_lock *fl, *victim = NULL;

	struct file_lock *fl, *victim = NULL;

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = file_inode(filp);

	struct inode *inode = dentry->d_inode;

	struct file_lock_context *ctx;

	struct file_lock_context *ctx;

	LIST_HEAD(dispose);

	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,

int generic_setlease(struct file *filp, long arg, struct file_lock **flp,

			void **priv)

			void **priv)

{

{

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = file_inode(filp);

	struct inode *inode = dentry->d_inode;

	int error;

	int error;





	if ((!uid_eq(current_fsuid(), inode->i_uid)) && !capable(CAP_LEASE))

	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;

	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

static int

check_fmode_for_setlk(struct file_lock *fl)

check_fmode_for_setlk(struct file_lock *fl)

{

{