Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <60ea4a58791290d479024baab54d384a49181ede.camel@kernel.org>
Subject: Re: [PATCH 1/2] lockd: set fl_owner when unlocking files
From:   Jeff Layton <jlayton@kernel.org>
To:     chuck.lever@oracle.com
Cc:     linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com,
        anna@kernel.org, "J . Bruce Fields" <bfields@fieldses.org>
Date:   Mon, 11 Jul 2022 14:36:50 -0400
In-Reply-To: <20220711183014.15161-2-jlayton@kernel.org>
References: <20220711183014.15161-1-jlayton@kernel.org>
         <20220711183014.15161-2-jlayton@kernel.org>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.3 (3.44.3-1.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2022-07-11 at 14:30 -0400, Jeff Layton wrote:
> Unlocking a POSIX inode with vfs_lock_file only works if the owner
> matches. Ensure we set it in the request.
>=20

Oof, that description makes no sense. How about:

"Unlocking a POSIX lock on an inode with vfs_lock_file..."

> Cc: J. Bruce Fields <bfields@fieldses.org>
> Fixes: 7f024fcd5c97 ("Keep read and write fds with each nlm_file")
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/lockd/svcsubs.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>=20
> diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
> index 0a22a2faf552..b2f277727469 100644
> --- a/fs/lockd/svcsubs.c
> +++ b/fs/lockd/svcsubs.c
> @@ -176,7 +176,7 @@ nlm_delete_file(struct nlm_file *file)
>  	}
>  }
> =20
> -static int nlm_unlock_files(struct nlm_file *file)
> +static int nlm_unlock_files(struct nlm_file *file, fl_owner_t owner)
>  {
>  	struct file_lock lock;
> =20
> @@ -184,6 +184,7 @@ static int nlm_unlock_files(struct nlm_file *file)
>  	lock.fl_type  =3D F_UNLCK;
>  	lock.fl_start =3D 0;
>  	lock.fl_end   =3D OFFSET_MAX;
> +	lock.fl_owner =3D owner;
>  	if (file->f_file[O_RDONLY] &&
>  	    vfs_lock_file(file->f_file[O_RDONLY], F_SETLK, &lock, NULL))
>  		goto out_err;
> @@ -225,7 +226,7 @@ nlm_traverse_locks(struct nlm_host *host, struct nlm_=
file *file,
>  		if (match(lockhost, host)) {
> =20
>  			spin_unlock(&flctx->flc_lock);
> -			if (nlm_unlock_files(file))
> +			if (nlm_unlock_files(file, fl->fl_owner))
>  				return 1;
>  			goto again;
>  		}

--=20
Jeff Layton <jlayton@kernel.org>