Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1558994pxp; Sun, 6 Mar 2022 19:09:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLSG0mCYP9y6cyDecDUdMsqCbIhDtXDJJhIONoerVKy7aeYN8DAV+UE1gRFvRHndOZxych X-Received: by 2002:a17:907:7656:b0:6d0:1f5a:2bec with SMTP id kj22-20020a170907765600b006d01f5a2becmr7521537ejc.164.1646622581249; Sun, 06 Mar 2022 19:09:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646622581; cv=none; d=google.com; s=arc-20160816; b=Autrh2lAGmOu2A7JqxBhkyMLRx3M0uyfqcKIdWf8JPx6nIVBdh7K2Jcmrw91Xhoyto DCJ6CpwHQrSC5qM69YDgk9gLmhXOBABdpjccANyLA1Y7jXPBX7cck+JnuV6t66jMkoq6 r+R0CsAh/7+2qmvoMlPvCUPimZoI2fPZf7iXbcMLRxx6mfha3jY9nc3N+jcKeBzKBNbC ZbBckN+n4zK3PPBF3HYNhIPSU6WOipmiuCunHAMYRVIyAMOC6S5X/wUgvkspyBCVIQIG 2oM33LZRtt9EyMPLNYVENXU5OazBoExaeHnRwK5dTxJLs1BrckqJnB6krVJXIZuh9MPF ezYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:dkim-signature:dkim-signature; bh=fm7lHAN5pwLLux0LIl0j4ave89T8JqzXvub0c5afKiY=; b=0jp73v/Um4AmB28VjEMIKaOW50Jl+XqhbTcoY+uCFIuiS5x6TqOS0+OATKDIispkWN E50gkhhyUzeZBRQl2BON71Bae1bx+8aXkMTrb94quaqGaN1Ak80ubozKyhT7HqFlr3km J1Y02w5om/lFvViOKfMWM248cueo/5L0J7MtdA11pDBKBWuSq3FUcAWASZHI28C11RRd cYxYIHfdShWgtk0UyHEApIC5lVcRKAVxQp1+Ry4RFPTCM+FJi4YwGh77GOzUtnX0jNYL J+F+tNKzjMDGJQTJleRkC7etWxC7RMnuJsJ9nw+saGyihJ5PTVGbizb+ocNtuz2Ew1oZ wcLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=g8xJfhwF; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m3-20020a50cc03000000b00411cd50fd1csi7521514edi.135.2022.03.06.19.09.12; Sun, 06 Mar 2022 19:09:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=g8xJfhwF; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234454AbiCFXnW (ORCPT + 99 others); Sun, 6 Mar 2022 18:43:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234453AbiCFXnV (ORCPT ); Sun, 6 Mar 2022 18:43:21 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 778EB2727 for ; Sun, 6 Mar 2022 15:42:28 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 31EB1210FC; Sun, 6 Mar 2022 23:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646610147; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fm7lHAN5pwLLux0LIl0j4ave89T8JqzXvub0c5afKiY=; b=g8xJfhwFNPfWpKROwxyaXSbghXEHULxF6aL34Ffu4EQt6tbaBlhTyBvWKszSJcKLXxf6Xt QLhCbf0u/cd/1a10tPtyIRY11xm6iFOwjJjfOrrW8HrqrFAXuR7KDTW4kWC3EZ8LCq1yf0 WBUDWwemyT3i7QQy61F9m4jewsBGdQE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646610147; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fm7lHAN5pwLLux0LIl0j4ave89T8JqzXvub0c5afKiY=; b=Bv7iGK0SYaZG3UKn5GMiJIJd2kLeQc1QIn3YEM8gIg094L3JG8NOD5FxdMNKCH3Rs9koQS paigHbcrs3ClpRAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CDEFA134CD; Sun, 6 Mar 2022 23:42:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id rFDVIeFGJWIIWAAAMHmgww (envelope-from ); Sun, 06 Mar 2022 23:42:25 +0000 Subject: [PATCH 01/11] NFS: remove IS_SWAPFILE hack From: NeilBrown To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Date: Mon, 07 Mar 2022 10:41:44 +1100 Message-ID: <164661010493.31054.5415277267173006275.stgit@noble.brown> In-Reply-To: <164660993703.31054.17075972410545449555.stgit@noble.brown> References: <164660993703.31054.17075972410545449555.stgit@noble.brown> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This code is pointless as IS_SWAPFILE is always defined. So remove it. Suggested-by: Mark Hemment Reviewed-by: Christoph Hellwig Signed-off-by: NeilBrown --- fs/nfs/file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 76d76acbc594..901f316f084d 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -44,11 +44,6 @@ static const struct vm_operations_struct nfs_file_vm_ops; -/* Hack for future NFS swap support */ -#ifndef IS_SWAPFILE -# define IS_SWAPFILE(inode) (0) -#endif - int nfs_check_flags(int flags) { if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))