Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3995518pxu; Mon, 30 Nov 2020 15:12:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhgAtkUSloBe3hh8vAiN/BkK2F29fkZwbuEj1qmkHjzNGTXb80TOOxAvBqfL6pW8XNupij X-Received: by 2002:a17:906:98d4:: with SMTP id zd20mr140591ejb.532.1606777951335; Mon, 30 Nov 2020 15:12:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606777951; cv=none; d=google.com; s=arc-20160816; b=CuHlQtlSP4fXQj2c810PWDmj4ZjsxnZgyt+mUfzAvGS+er9xmaiS7/FYin53St42JS mnZddgak+rJdheMQk9TKfFoa/jeftF5mFGeQU1FSsIUUKQBa+ttpHncvWHICA9HTNRmW pQweLztBh4IrYh3gBOX/3tG2I2i02InfhGhbQsFDDL81//+4MwdTXyPJ0yq1cWtJQW8v 95tibWy8++Y5DeuJdyFnyz+l1YjBbHf1XKvMYDDAXUR7hYznaG3b99nE7XPjd1DINO4/ 5XH4w/rmuOJNtfi4eRlcnhDa0jZemAE7MNYbwQIsrUcdd/P6r88mL8NrvqV9m3B6IFN7 SDRA== 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-signature:dkim-filter; bh=DGjRdTTp0fC8+OwdGjwUTPlx6clpeTm7cPoicFPN7lE=; b=e3+qrAqRjytmnG0yMdEDpVbI/3P0HFgcg0AB3pOU0+cU5od9kJgdc796kYqe3EkChk lhRAiQUJkOVaFLPrvz3535rS0oATKUXH6/oQyMyo2U1wqKCNcASg0maQ3NL8G1oLvtT2 wAo10BkrcAuI+T/lRNH9Bh6rZayP/26Pz9/4C8tJpOryL3VNzDw9qfpgPnFgoDdXsKl9 SWDgh1ToPa0dxEFiQMUS7HYri2bEJwC9AqrfSmACs9C4/BbzGwDLVay1FFWri3ADEv+N PPZC+XB+AgIQ/GZRHGe0Q8/IBpXJ1e0DrxootLTOky1e/bA1S/qdHI4DNYW+cKUj6BUW 76CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fieldses.org header.s=default header.b=a+ybQJh3; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s9si130935edt.290.2020.11.30.15.12.09; Mon, 30 Nov 2020 15:12:31 -0800 (PST) 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; dkim=pass header.i=@fieldses.org header.s=default header.b=a+ybQJh3; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729171AbgK3WrB (ORCPT + 99 others); Mon, 30 Nov 2020 17:47:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728509AbgK3WrB (ORCPT ); Mon, 30 Nov 2020 17:47:01 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2831C0613D3 for ; Mon, 30 Nov 2020 14:46:20 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 31ECABD7; Mon, 30 Nov 2020 17:46:20 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 31ECABD7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1606776380; bh=DGjRdTTp0fC8+OwdGjwUTPlx6clpeTm7cPoicFPN7lE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a+ybQJh3AK1ld4aBfJEyPRhTt02NX/c7ANkDQpgBPic93qp5JZDD3xpypJR4vRrrd ByWdN29UAPJVpel/hyG6KXTQ7m9zQNHQwdr8/0XjdM68tgq0SxJ7xGIrnUJtrur6y6 dYxAdXClItsKl0C2R+QY7Fos4SpSf0qhdNfzny/4= From: "J. Bruce Fields" To: Chuck Lever Cc: linux-nfs@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 2/5] nfsd: simplify nfsd4_change_info Date: Mon, 30 Nov 2020 17:46:15 -0500 Message-Id: <1606776378-22381-2-git-send-email-bfields@fieldses.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1606776378-22381-1-git-send-email-bfields@fieldses.org> References: <1606776378-22381-1-git-send-email-bfields@fieldses.org> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" It doesn't make sense to carry all these extra fields around. Just make everything into change attribute from the start. This is just cleanup, there should be no change in behavior. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4xdr.c | 11 ++--------- fs/nfsd/xdr4.h | 11 ----------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 56fd5f6d5c44..18c912930947 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2331,15 +2331,8 @@ static __be32 *encode_time_delta(__be32 *p, struct inode *inode) static __be32 *encode_cinfo(__be32 *p, struct nfsd4_change_info *c) { *p++ = cpu_to_be32(c->atomic); - if (c->change_supported) { - p = xdr_encode_hyper(p, c->before_change); - p = xdr_encode_hyper(p, c->after_change); - } else { - *p++ = cpu_to_be32(c->before_ctime_sec); - *p++ = cpu_to_be32(c->before_ctime_nsec); - *p++ = cpu_to_be32(c->after_ctime_sec); - *p++ = cpu_to_be32(c->after_ctime_nsec); - } + p = xdr_encode_hyper(p, c->before_change); + p = xdr_encode_hyper(p, c->after_change); return p; } diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 679d40af1bbb..3a59053084e6 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -76,12 +76,7 @@ static inline bool nfsd4_has_session(struct nfsd4_compound_state *cs) struct nfsd4_change_info { u32 atomic; - bool change_supported; - u32 before_ctime_sec; - u32 before_ctime_nsec; u64 before_change; - u32 after_ctime_sec; - u32 after_ctime_nsec; u64 after_change; }; @@ -768,15 +763,9 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) { BUG_ON(!fhp->fh_pre_saved); cinfo->atomic = (u32)fhp->fh_post_saved; - cinfo->change_supported = IS_I_VERSION(d_inode(fhp->fh_dentry)); cinfo->before_change = fhp->fh_pre_change; cinfo->after_change = fhp->fh_post_change; - cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec; - cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec; - cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec; - cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec; - } -- 2.28.0