Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp354008pxb; Mon, 16 Aug 2021 07:00:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsRUbJpabQsp3ZxB5XpkefukePBdWDqZFZjeKlTVGzYOkWtD8CqDzk4JarLuwmIQmaKfix X-Received: by 2002:a05:6602:20d2:: with SMTP id 18mr12936972ioz.85.1629122445479; Mon, 16 Aug 2021 07:00:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629122445; cv=none; d=google.com; s=arc-20160816; b=ZOq3hMNp+i3x44asXXA+g+a1v2n4Ko+ve7oWkdqjsZAn/TPe/B8bl+hWrzTzJRGdbQ Sd1+QmAc2JWAcbl0AnxjlVJ8/Z0OMLseGHh53y9OnDYLcivkv7ciRMEISPsk+bw/IX1B 7W4M6KSoxVovyXZlY21Zado++UuoAgFGsplRyfCGBRjybMOoPcHpbHfXQxCo/dS1NXdQ DED7nlQz0aRepycuDY/jh0tpnNXWQxYgouL4ZAdjPRjp4VM4OPJmT7jIa+oBFWgvw9Dn oS3IpCo92APn/ZDD9rgqyM2eyurI8adwtlwjc+cG4hGd9rV3iPbufL6z1Uzw2mthqfTe dhog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-filter; bh=HiV6xbpuDJRo0IllGDoowewoTmamLY6aSWfleQgFe/E=; b=l879br3WVViD/DMrhuYHIXvegcFLd5KfrHAcSlvKWT88okHQpb2v1Oq1dfU1WH6dVw 7qf0hhJEt+pRJx6Xfgtag2Jv7/uF+A8/icWQC9Kf5CwjdM9sFsT5YrnzvPiFEZL+33Ft eHA0mS4v/OVSxyC/BGNKOWRPUXECzjqemhLpRiGlf5q8KgkvpbzfCXbvkLd8fcmFAmbN 78xSa2+hses6T1CKKIqgazjZIzFae6C/lBVfRP7XHrR+WIhxSWpV8HC74WgmjX3Cll8E 4BfqPdLTSpUG6BFsz1QDTYdroZ65m3DmUFFwIEgmtDExspX89HkV1OAiKVU1D81sKwpU OqRw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n13si3073817ili.37.2021.08.16.07.00.22; Mon, 16 Aug 2021 07:00:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbhHPOAp (ORCPT + 99 others); Mon, 16 Aug 2021 10:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbhHPOAX (ORCPT ); Mon, 16 Aug 2021 10:00:23 -0400 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4621AC0613A4 for ; Mon, 16 Aug 2021 06:59:30 -0700 (PDT) Received: by fieldses.org (Postfix, from userid 2815) id BF16F4F7C; Mon, 16 Aug 2021 09:59:28 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org BF16F4F7C From: "J. Bruce Fields" To: Trond Myklebust , Anna Schumaker Cc: daire@dneg.com, linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 3/8] nlm: minor refactoring Date: Mon, 16 Aug 2021 09:59:22 -0400 Message-Id: <1629122367-18541-4-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1629122367-18541-1-git-send-email-bfields@redhat.com> References: <1629122367-18541-1-git-send-email-bfields@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" --- 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