From: Jeff Layton <jlayton@kernel.org>
To: 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>,
Neil Brown <neilb@suse.de>, 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>
Cc: 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: [PATCH v3 06/47] afs: convert to using new filelock helpers
Date: Wed, 31 Jan 2024 18:01:47 -0500 [thread overview]
Message-ID: <20240131-flsplit-v3-6-c6129007ee8d@kernel.org> (raw)
In-Reply-To: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org>
Convert to using the new file locking helper functions. Also, in later
patches we're going to introduce macros that conflict with the variable
name in afs_next_locker. Rename it.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
fs/afs/flock.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 9c6dea3139f5..4eee3d1ca5ad 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -93,13 +93,13 @@ static void afs_grant_locks(struct afs_vnode *vnode)
bool exclusive = (vnode->lock_type == AFS_LOCK_WRITE);
list_for_each_entry_safe(p, _p, &vnode->pending_locks, fl_u.afs.link) {
- if (!exclusive && p->fl_type == F_WRLCK)
+ if (!exclusive && lock_is_write(p))
continue;
list_move_tail(&p->fl_u.afs.link, &vnode->granted_locks);
p->fl_u.afs.state = AFS_LOCK_GRANTED;
trace_afs_flock_op(vnode, p, afs_flock_op_grant);
- wake_up(&p->fl_wait);
+ locks_wake_up(p);
}
}
@@ -112,25 +112,25 @@ static void afs_next_locker(struct afs_vnode *vnode, int error)
{
struct file_lock *p, *_p, *next = NULL;
struct key *key = vnode->lock_key;
- unsigned int fl_type = F_RDLCK;
+ unsigned int type = F_RDLCK;
_enter("");
if (vnode->lock_type == AFS_LOCK_WRITE)
- fl_type = F_WRLCK;
+ type = F_WRLCK;
list_for_each_entry_safe(p, _p, &vnode->pending_locks, fl_u.afs.link) {
if (error &&
- p->fl_type == fl_type &&
+ p->fl_type == type &&
afs_file_key(p->fl_file) == key) {
list_del_init(&p->fl_u.afs.link);
p->fl_u.afs.state = error;
- wake_up(&p->fl_wait);
+ locks_wake_up(p);
}
/* Select the next locker to hand off to. */
if (next &&
- (next->fl_type == F_WRLCK || p->fl_type == F_RDLCK))
+ (lock_is_write(next) || lock_is_read(p)))
continue;
next = p;
}
@@ -142,7 +142,7 @@ static void afs_next_locker(struct afs_vnode *vnode, int error)
afs_set_lock_state(vnode, AFS_VNODE_LOCK_SETTING);
next->fl_u.afs.state = AFS_LOCK_YOUR_TRY;
trace_afs_flock_op(vnode, next, afs_flock_op_wake);
- wake_up(&next->fl_wait);
+ locks_wake_up(next);
} else {
afs_set_lock_state(vnode, AFS_VNODE_LOCK_NONE);
trace_afs_flock_ev(vnode, NULL, afs_flock_no_lockers, 0);
@@ -166,7 +166,7 @@ static void afs_kill_lockers_enoent(struct afs_vnode *vnode)
struct file_lock, fl_u.afs.link);
list_del_init(&p->fl_u.afs.link);
p->fl_u.afs.state = -ENOENT;
- wake_up(&p->fl_wait);
+ locks_wake_up(p);
}
key_put(vnode->lock_key);
@@ -471,7 +471,7 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl)
fl->fl_u.afs.state = AFS_LOCK_PENDING;
partial = (fl->fl_start != 0 || fl->fl_end != OFFSET_MAX);
- type = (fl->fl_type == F_RDLCK) ? AFS_LOCK_READ : AFS_LOCK_WRITE;
+ type = lock_is_read(fl) ? AFS_LOCK_READ : AFS_LOCK_WRITE;
if (mode == afs_flock_mode_write && partial)
type = AFS_LOCK_WRITE;
@@ -734,7 +734,7 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)
/* check local lock records first */
posix_test_lock(file, fl);
- if (fl->fl_type == F_UNLCK) {
+ if (lock_is_unlock(fl)) {
/* no local locks; consult the server */
ret = afs_fetch_status(vnode, key, false, NULL);
if (ret < 0)
@@ -778,7 +778,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl)
fl->fl_u.afs.debug_id = atomic_inc_return(&afs_file_lock_debug_id);
trace_afs_flock_op(vnode, fl, afs_flock_op_lock);
- if (fl->fl_type == F_UNLCK)
+ if (lock_is_unlock(fl))
ret = afs_do_unlk(file, fl);
else
ret = afs_do_setlk(file, fl);
@@ -820,7 +820,7 @@ int afs_flock(struct file *file, int cmd, struct file_lock *fl)
trace_afs_flock_op(vnode, fl, afs_flock_op_flock);
/* we're simulating flock() locks using posix locks on the server */
- if (fl->fl_type == F_UNLCK)
+ if (lock_is_unlock(fl))
ret = afs_do_unlk(file, fl);
else
ret = afs_do_setlk(file, fl);
--
2.43.0
next prev parent reply other threads:[~2024-01-31 23:02 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 23:01 [PATCH v3 00/47] filelock: split file leases out of struct file_lock Jeff Layton
2024-01-31 23:01 ` [PATCH v3 01/47] filelock: fl_pid field should be signed int Jeff Layton
2024-01-31 23:01 ` [PATCH v3 02/47] filelock: rename some fields in tracepoints Jeff Layton
2024-01-31 23:01 ` [PATCH v3 03/47] filelock: rename fl_pid variable in lock_get_status Jeff Layton
2024-01-31 23:01 ` [PATCH v3 04/47] filelock: add some new helper functions Jeff Layton
2024-02-05 11:36 ` Christian Brauner
2024-02-05 11:55 ` Jeff Layton
2024-02-05 11:57 ` Christian Brauner
2024-02-05 12:06 ` Jeff Layton
2024-02-05 12:19 ` Christian Brauner
2024-01-31 23:01 ` [PATCH v3 05/47] 9p: rename fl_type variable in v9fs_file_do_lock Jeff Layton
2024-01-31 23:01 ` Jeff Layton [this message]
2024-01-31 23:01 ` [PATCH v3 07/47] ceph: convert to using new filelock helpers Jeff Layton
2024-01-31 23:01 ` [PATCH v3 08/47] dlm: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 09/47] gfs2: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 10/47] lockd: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 11/47] nfs: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 12/47] nfsd: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 13/47] ocfs2: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 14/47] smb/client: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 15/47] smb/server: " Jeff Layton
2024-01-31 23:01 ` [PATCH v3 16/47] filelock: drop the IS_* macros Jeff Layton
2024-01-31 23:01 ` [PATCH v3 17/47] filelock: split common fields into struct file_lock_core Jeff Layton
2024-01-31 23:01 ` [PATCH v3 18/47] filelock: have fs/locks.c deal with file_lock_core directly Jeff Layton
2024-01-31 23:02 ` [PATCH v3 19/47] filelock: convert more internal functions to use file_lock_core Jeff Layton
2024-01-31 23:02 ` [PATCH v3 20/47] filelock: make posix_same_owner take file_lock_core pointers Jeff Layton
2024-01-31 23:02 ` [PATCH v3 21/47] filelock: convert posix_owner_key to take file_lock_core arg Jeff Layton
2024-01-31 23:02 ` [PATCH v3 22/47] filelock: make locks_{insert,delete}_global_locks " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 23/47] filelock: convert locks_{insert,delete}_global_blocked Jeff Layton
2024-01-31 23:02 ` [PATCH v3 24/47] filelock: make __locks_delete_block and __locks_wake_up_blocks take file_lock_core Jeff Layton
2024-01-31 23:02 ` [PATCH v3 25/47] filelock: convert __locks_insert_block, conflict and deadlock checks to use file_lock_core Jeff Layton
2024-02-18 12:16 ` Jeff Layton
2024-01-31 23:02 ` [PATCH v3 26/47] filelock: convert fl_blocker to file_lock_core Jeff Layton
2024-01-31 23:02 ` [PATCH v3 27/47] filelock: clean up locks_delete_block internals Jeff Layton
2024-01-31 23:02 ` [PATCH v3 28/47] filelock: reorganize locks_delete_block and __locks_insert_block Jeff Layton
2024-01-31 23:02 ` [PATCH v3 29/47] filelock: make assign_type helper take a file_lock_core pointer Jeff Layton
2024-01-31 23:02 ` [PATCH v3 30/47] filelock: convert locks_wake_up_blocks to " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 31/47] filelock: convert locks_insert_lock_ctx and locks_delete_lock_ctx Jeff Layton
2024-01-31 23:02 ` [PATCH v3 32/47] filelock: convert locks_translate_pid to take file_lock_core Jeff Layton
2024-01-31 23:02 ` [PATCH v3 33/47] filelock: convert seqfile handling to use file_lock_core Jeff Layton
2024-01-31 23:02 ` [PATCH v3 34/47] 9p: adapt to breakup of struct file_lock Jeff Layton
2024-02-01 22:40 ` NeilBrown
2024-01-31 23:02 ` [PATCH v3 35/47] afs: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 36/47] ceph: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 37/47] dlm: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 38/47] gfs2: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 39/47] fuse: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 40/47] lockd: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 41/47] nfs: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 42/47] nfsd: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 43/47] ocfs2: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 44/47] smb/client: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 45/47] smb/server: " Jeff Layton
2024-01-31 23:02 ` [PATCH v3 46/47] filelock: remove temporary compatibility macros Jeff Layton
2024-01-31 23:02 ` [PATCH v3 47/47] filelock: split leases out of struct file_lock Jeff Layton
2024-02-01 22:49 ` [PATCH v3 00/47] filelock: split file " NeilBrown
2024-02-02 11:16 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240131-flsplit-v3-6-c6129007ee8d@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=aahringo@redhat.com \
--cc=agruenba@redhat.com \
--cc=anna@kernel.org \
--cc=asmadeus@codewreck.org \
--cc=brauner@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=chuck.lever@oracle.com \
--cc=dhowells@redhat.com \
--cc=ericvh@kernel.org \
--cc=gfs2@lists.linux.dev \
--cc=idryomov@gmail.com \
--cc=jack@suse.cz \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=kolga@netapp.com \
--cc=linkinjeon@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=lucho@ionkov.net \
--cc=marc.dionne@auristor.com \
--cc=mark@fasheh.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=miklos@szeredi.hu \
--cc=neilb@suse.de \
--cc=ocfs2-devel@lists.linux.dev \
--cc=pc@manguebit.com \
--cc=ronniesahlberg@gmail.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
--cc=sfrench@samba.org \
--cc=sprasad@microsoft.com \
--cc=teigland@redhat.com \
--cc=tom@talpey.com \
--cc=trond.myklebust@hammerspace.com \
--cc=v9fs@lists.linux.dev \
--cc=viro@zeniv.linux.org.uk \
--cc=xiubli@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).