Received-SPF: pass (google.com: domain of linux-nfs+bounces-1704-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
MIME-Version: 1.0
From: "NeilBrown" <neilb@suse.de>
To: "Jeff Layton" <jlayton@kernel.org>
Cc: "Steven Rostedt" <rostedt@goodmis.org>,
 "Masami Hiramatsu" <mhiramat@kernel.org>,
 "Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
 "Chuck Lever" <chuck.lever@oracle.com>,
 "Alexander Viro" <viro@zeniv.linux.org.uk>,
 "Christian Brauner" <brauner@kernel.org>, "Jan Kara" <jack@suse.cz>,
 "Eric Van Hensbergen" <ericvh@kernel.org>,
 "Latchesar Ionkov" <lucho@ionkov.net>,
 "Dominique Martinet" <asmadeus@codewreck.org>,
 "Christian Schoenebeck" <linux_oss@crudebyte.com>,
 "David Howells" <dhowells@redhat.com>,
 "Marc Dionne" <marc.dionne@auristor.com>, "Xiubo Li" <xiubli@redhat.com>,
 "Ilya Dryomov" <idryomov@gmail.com>, "Alexander Aring" <aahringo@redhat.com>,
 "David Teigland" <teigland@redhat.com>,
 "Andreas Gruenbacher" <agruenba@redhat.com>,
 "Olga Kornievskaia" <kolga@netapp.com>, "Dai Ngo" <Dai.Ngo@oracle.com>,
 "Tom Talpey" <tom@talpey.com>,
 "Trond Myklebust" <trond.myklebust@hammerspace.com>,
 "Anna Schumaker" <anna@kernel.org>, "Mark Fasheh" <mark@fasheh.com>,
 "Joel Becker" <jlbec@evilplan.org>, "Joseph Qi" <joseph.qi@linux.alibaba.com>,
 "Steve French" <sfrench@samba.org>, "Paulo Alcantara" <pc@manguebit.com>,
 "Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
 "Shyam Prasad N" <sprasad@microsoft.com>,
 "Namjae Jeon" <linkinjeon@kernel.org>,
 "Sergey Senozhatsky" <senozhatsky@chromium.org>,
 "Miklos Szeredi" <miklos@szeredi.hu>, linux-kernel@vger.kernel.org,
 linux-trace-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
 v9fs@lists.linux.dev, linux-afs@lists.infradead.org,
 ceph-devel@vger.kernel.org, gfs2@lists.linux.dev, linux-nfs@vger.kernel.org,
 ocfs2-devel@lists.linux.dev, linux-cifs@vger.kernel.org,
 "Jeff Layton" <jlayton@kernel.org>
Subject: Re: [PATCH v3 34/47] 9p: adapt to breakup of struct file_lock
In-reply-to: <20240131-flsplit-v3-34-c6129007ee8d@kernel.org>
References: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org>,
 <20240131-flsplit-v3-34-c6129007ee8d@kernel.org>
Date: Fri, 02 Feb 2024 09:40:44 +1100
Message-id: <170682724439.13976.1445220862078988301@noble.neil.brown.name>

On Thu, 01 Feb 2024, Jeff Layton wrote:
> Most of the existing APIs have remained the same, but subsystems that
> access file_lock fields directly need to reach into struct
> file_lock_core now.
>=20
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/9p/vfs_file.c | 39 +++++++++++++++++++--------------------
>  1 file changed, 19 insertions(+), 20 deletions(-)
>=20
> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> index a1dabcf73380..abdbbaee5184 100644
> --- a/fs/9p/vfs_file.c
> +++ b/fs/9p/vfs_file.c
> @@ -9,7 +9,6 @@
>  #include <linux/module.h>
>  #include <linux/errno.h>
>  #include <linux/fs.h>
> -#define _NEED_FILE_LOCK_FIELD_MACROS
>  #include <linux/filelock.h>
>  #include <linux/sched.h>
>  #include <linux/file.h>
> @@ -108,7 +107,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, s=
truct file_lock *fl)
> =20
>  	p9_debug(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
> =20
> -	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type !=3D F_UNLCK) {
> +	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->c.flc_type !=3D F_UNLCK) {

Should this have already been changed to lock_is_unlock() ???

NeilBrown


>  		filemap_write_and_wait(inode->i_mapping);
>  		invalidate_mapping_pages(&inode->i_data, 0, -1);
>  	}
> @@ -127,7 +126,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd=
, struct file_lock *fl)
>  	fid =3D filp->private_data;
>  	BUG_ON(fid =3D=3D NULL);
> =20
> -	BUG_ON((fl->fl_flags & FL_POSIX) !=3D FL_POSIX);
> +	BUG_ON((fl->c.flc_flags & FL_POSIX) !=3D FL_POSIX);
> =20
>  	res =3D locks_lock_file_wait(filp, fl);
>  	if (res < 0)
> @@ -136,7 +135,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd=
, struct file_lock *fl)
>  	/* convert posix lock to p9 tlock args */
>  	memset(&flock, 0, sizeof(flock));
>  	/* map the lock type */
> -	switch (fl->fl_type) {
> +	switch (fl->c.flc_type) {
>  	case F_RDLCK:
>  		flock.type =3D P9_LOCK_TYPE_RDLCK;
>  		break;
> @@ -152,7 +151,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd=
, struct file_lock *fl)
>  		flock.length =3D 0;
>  	else
>  		flock.length =3D fl->fl_end - fl->fl_start + 1;
> -	flock.proc_id =3D fl->fl_pid;
> +	flock.proc_id =3D fl->c.flc_pid;
>  	flock.client_id =3D fid->clnt->name;
>  	if (IS_SETLKW(cmd))
>  		flock.flags =3D P9_LOCK_FLAGS_BLOCK;
> @@ -207,13 +206,13 @@ static int v9fs_file_do_lock(struct file *filp, int c=
md, struct file_lock *fl)
>  	 * incase server returned error for lock request, revert
>  	 * it locally
>  	 */
> -	if (res < 0 && fl->fl_type !=3D F_UNLCK) {
> -		unsigned char type =3D fl->fl_type;
> +	if (res < 0 && fl->c.flc_type !=3D F_UNLCK) {
> +		unsigned char type =3D fl->c.flc_type;
> =20
> -		fl->fl_type =3D F_UNLCK;
> +		fl->c.flc_type =3D F_UNLCK;
>  		/* Even if this fails we want to return the remote error */
>  		locks_lock_file_wait(filp, fl);
> -		fl->fl_type =3D type;
> +		fl->c.flc_type =3D type;
>  	}
>  	if (flock.client_id !=3D fid->clnt->name)
>  		kfree(flock.client_id);
> @@ -235,7 +234,7 @@ static int v9fs_file_getlock(struct file *filp, struct =
file_lock *fl)
>  	 * if we have a conflicting lock locally, no need to validate
>  	 * with server
>  	 */
> -	if (fl->fl_type !=3D F_UNLCK)
> +	if (fl->c.flc_type !=3D F_UNLCK)
>  		return res;
> =20
>  	/* convert posix lock to p9 tgetlock args */
> @@ -246,7 +245,7 @@ static int v9fs_file_getlock(struct file *filp, struct =
file_lock *fl)
>  		glock.length =3D 0;
>  	else
>  		glock.length =3D fl->fl_end - fl->fl_start + 1;
> -	glock.proc_id =3D fl->fl_pid;
> +	glock.proc_id =3D fl->c.flc_pid;
>  	glock.client_id =3D fid->clnt->name;
> =20
>  	res =3D p9_client_getlock_dotl(fid, &glock);
> @@ -255,13 +254,13 @@ static int v9fs_file_getlock(struct file *filp, struc=
t file_lock *fl)
>  	/* map 9p lock type to os lock type */
>  	switch (glock.type) {
>  	case P9_LOCK_TYPE_RDLCK:
> -		fl->fl_type =3D F_RDLCK;
> +		fl->c.flc_type =3D F_RDLCK;
>  		break;
>  	case P9_LOCK_TYPE_WRLCK:
> -		fl->fl_type =3D F_WRLCK;
> +		fl->c.flc_type =3D F_WRLCK;
>  		break;
>  	case P9_LOCK_TYPE_UNLCK:
> -		fl->fl_type =3D F_UNLCK;
> +		fl->c.flc_type =3D F_UNLCK;
>  		break;
>  	}
>  	if (glock.type !=3D P9_LOCK_TYPE_UNLCK) {
> @@ -270,7 +269,7 @@ static int v9fs_file_getlock(struct file *filp, struct =
file_lock *fl)
>  			fl->fl_end =3D OFFSET_MAX;
>  		else
>  			fl->fl_end =3D glock.start + glock.length - 1;
> -		fl->fl_pid =3D -glock.proc_id;
> +		fl->c.flc_pid =3D -glock.proc_id;
>  	}
>  out:
>  	if (glock.client_id !=3D fid->clnt->name)
> @@ -294,7 +293,7 @@ static int v9fs_file_lock_dotl(struct file *filp, int c=
md, struct file_lock *fl)
>  	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",
>  		 filp, cmd, fl, filp);
> =20
> -	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type !=3D F_UNLCK) {
> +	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->c.flc_type !=3D F_UNLCK) {
>  		filemap_write_and_wait(inode->i_mapping);
>  		invalidate_mapping_pages(&inode->i_data, 0, -1);
>  	}
> @@ -325,16 +324,16 @@ static int v9fs_file_flock_dotl(struct file *filp, in=
t cmd,
>  	p9_debug(P9_DEBUG_VFS, "filp: %p cmd:%d lock: %p name: %pD\n",
>  		 filp, cmd, fl, filp);
> =20
> -	if (!(fl->fl_flags & FL_FLOCK))
> +	if (!(fl->c.flc_flags & FL_FLOCK))
>  		goto out_err;
> =20
> -	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type !=3D F_UNLCK) {
> +	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->c.flc_type !=3D F_UNLCK) {
>  		filemap_write_and_wait(inode->i_mapping);
>  		invalidate_mapping_pages(&inode->i_data, 0, -1);
>  	}
>  	/* Convert flock to posix lock */
> -	fl->fl_flags |=3D FL_POSIX;
> -	fl->fl_flags ^=3D FL_FLOCK;
> +	fl->c.flc_flags |=3D FL_POSIX;
> +	fl->c.flc_flags ^=3D FL_FLOCK;
> =20
>  	if (IS_SETLK(cmd) | IS_SETLKW(cmd))
>  		ret =3D v9fs_file_do_lock(filp, cmd, fl);
>=20
> --=20
> 2.43.0
>=20
>=20