diff options
| author | Jeff Layton <jlayton@kernel.org> | 2022-11-25 08:48:37 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@kernel.org> | 2023-01-11 06:52:43 -0500 |
| commit | c65454a947263dfdf482076388aaed60af84ca2f (patch) | |
| tree | 9c022ee614ba4907ae39f49a20af22c5981ad61f /include | |
| parent | 5970e15dbcfeb0ed3a0bf1954f35bbe60a048754 (diff) | |
| download | lwn-c65454a947263dfdf482076388aaed60af84ca2f.tar.gz lwn-c65454a947263dfdf482076388aaed60af84ca2f.zip | |
fs: remove locks_inode
locks_inode was turned into a wrapper around file_inode in de2a4a501e71
(Partially revert "locks: fix file locking on overlayfs"). Finish
replacing locks_inode invocations everywhere with file_inode.
Acked-by: Miklos Szeredi <mszeredi@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/filelock.h | 4 | ||||
| -rw-r--r-- | include/linux/lockd/lockd.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/filelock.h b/include/linux/filelock.h index dc5056a66e2c..efcdd1631d9b 100644 --- a/include/linux/filelock.h +++ b/include/linux/filelock.h @@ -133,8 +133,6 @@ struct file_lock_context { struct list_head flc_lease; }; -#define locks_inode(f) file_inode(f) - #ifdef CONFIG_FILE_LOCKING int fcntl_getlk(struct file *, unsigned int, struct flock *); int fcntl_setlk(unsigned int, struct file *, unsigned int, @@ -345,7 +343,7 @@ locks_inode_context(const struct inode *inode) static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl) { - return locks_lock_inode_wait(locks_inode(filp), fl); + return locks_lock_inode_wait(file_inode(filp), fl); } #ifdef CONFIG_FILE_LOCKING diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 70ce419e2709..2b7f067af3c4 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -312,7 +312,7 @@ static inline struct file *nlmsvc_file_file(struct nlm_file *file) static inline struct inode *nlmsvc_file_inode(struct nlm_file *file) { - return locks_inode(nlmsvc_file_file(file)); + return file_inode(nlmsvc_file_file(file)); } static inline int __nlm_privileged_request4(const struct sockaddr *sap) @@ -372,7 +372,7 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp) static inline int nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2) { - return locks_inode(fl1->fl_file) == locks_inode(fl2->fl_file) + return file_inode(fl1->fl_file) == file_inode(fl2->fl_file) && fl1->fl_pid == fl2->fl_pid && fl1->fl_owner == fl2->fl_owner && fl1->fl_start == fl2->fl_start |