Re: [PATCH 3/8] nlm: minor refactoring

Chuck Lever III
2021-08-21T16:30:50Z

> On Aug 20, 2021, at 5:02 PM, J. Bruce Fields <bfields@redhat.com> wrote:
>
> From: "J. Bruce Fields" <bfields@redhat.com>

Missing Signed-off-by?

And add just a little text that explains why this change is needed?

> ---
> fs/lockd/svclock.c | 16 ++++++++--------
> fs/lockd/svcsubs.c | 4 ++--
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
> index 1781fc5e9091..bc1cf31f3cce 100644
> --- a/fs/lockd/svclock.c
> +++ b/fs/lockd/svclock.c
> @@ -474,8 +474,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
> __be32 ret;
>
> dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",
> - locks_inode(file->f_file)->i_sb->s_id,
> - locks_inode(file->f_file)->i_ino,
> + nlmsvc_file_inode(file)->i_sb->s_id,
> + nlmsvc_file_inode(file)->i_ino,
> lock->fl.fl_type, lock->fl.fl_pid,
> (long long)lock->fl.fl_start,
> (long long)lock->fl.fl_end,
> @@ -581,8 +581,8 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
> struct nlm_lockowner *test_owner;
>
> dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",
> - locks_inode(file->f_file)->i_sb->s_id,
> - locks_inode(file->f_file)->i_ino,
> + nlmsvc_file_inode(file)->i_sb->s_id,
> + nlmsvc_file_inode(file)->i_ino,
> lock->fl.fl_type,
> (long long)lock->fl.fl_start,
> (long long)lock->fl.fl_end);
> @@ -644,8 +644,8 @@ nlmsvc_unlock(struct net *net, struct nlm_file *file, struct nlm_lock *lock)
> int error;
>
> dprintk("lockd: nlmsvc_unlock(%s/%ld, pi=%d, %Ld-%Ld)\n",
> - locks_inode(file->f_file)->i_sb->s_id,
> - locks_inode(file->f_file)->i_ino,
> + nlmsvc_file_inode(file)->i_sb->s_id,
> + nlmsvc_file_inode(file)->i_ino,
> lock->fl.fl_pid,
> (long long)lock->fl.fl_start,
> (long long)lock->fl.fl_end);
> @@ -673,8 +673,8 @@ nlmsvc_cancel_blocked(struct net *net, struct nlm_file *file, struct nlm_lock *l
> int status = 0;
>
> dprintk("lockd: nlmsvc_cancel(%s/%ld, pi=%d, %Ld-%Ld)\n",
> - locks_inode(file->f_file)->i_sb->s_id,
> - locks_inode(file->f_file)->i_ino,
> + nlmsvc_file_inode(file)->i_sb->s_id,
> + nlmsvc_file_inode(file)->i_ino,
> lock->fl.fl_pid,
> (long long)lock->fl.fl_start,
> (long long)lock->fl.fl_end);
> diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
> index bbd2bdde4bea..2558598610a9 100644
> --- a/fs/lockd/svcsubs.c
> +++ b/fs/lockd/svcsubs.c
> @@ -45,7 +45,7 @@ static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f)
>
> static inline void nlm_debug_print_file(char *msg, struct nlm_file *file)
> {
> - struct inode *inode = locks_inode(file->f_file);
> + struct inode *inode = nlmsvc_file_inode(file);
>
> dprintk("lockd: %s %s/%ld\n",
> msg, inode->i_sb->s_id, inode->i_ino);
> @@ -415,7 +415,7 @@ nlmsvc_match_sb(void *datap, struct nlm_file *file)
> {
> struct super_block *sb = datap;
>
> - return sb == locks_inode(file->f_file)->i_sb;
> + return sb == nlmsvc_file_inode(file)->i_sb;
> }
>
> /**
> --
> 2.31.1
>

--
Chuck Lever