Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp829187pxb; Tue, 8 Feb 2022 03:31:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJz34TfOACbxxKlHs7G/B5GDiztTbgYqiTi7xNrF/toAOMRPh8sJybHb362z25UOP7XJNOcP X-Received: by 2002:a17:906:9756:: with SMTP id o22mr3417342ejy.448.1644319913934; Tue, 08 Feb 2022 03:31:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644319913; cv=none; d=google.com; s=arc-20160816; b=VLdMuh0pVEigjWYqrExXHNkB/gQgiI+ryjwbsT+FJDDVjZ2h/imXyv5RkN6rSvcJ+k eY0D7W5UjeraZL2ltWchLejo85e91D+W08AoDCPwZUSZtDqk/pDVzOY+O/+nyYZz+QEI iJ5k5HHN6MZXfTwqa8RtiuI57s4FlnSRnCdudEWQL1MmUV4OwOmhk3SnQMfKSfRmm9lN 3NVmUM9bZBU/tLJGc2uJ+x3ce6Y5Ww74Dj3xZhjGjkm+4mPQa+HRevDP8KPHLGAOzkQ6 7C4T7lKAtaHKKslg4IPHR5yZ2oLnUjJ7vlDSdydYBeYeQjZm8kl7DmVEGhKJO0nYSKnK 48TQ== 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=2w8E8+D8DnDn4oux4W6cKi7wJrd0JGZITu8BgcqO5/k=; b=C4uq3k60R53xPmEsIzwxwax2X834I3pt4HJiPYjsnO1sZPvhHuwvkChhasTJsOWund 5pzqsJ91FZPnCUPNP3xxDLCU+6QOPnQui2LQl3frUz/yhnHgbMR1iZRnBE9d3bAgpEmC hg6jIkVJp116n1BGlE3ojpv+S1s8xfas3kiS5bIfn03nz/1ISWSuLa4Fg5mQjfje2JA1 O09gH6SdljAvD/rO+YyjEmDcE+Eew+UI7hV3herX9s/7zE/NALmHSkn0tSsk4YtF3eHA 83T+LfgI2qoMlvnKrbN/MxK9XracNtpL60eo2RaEWFpJ2sav9quqI+56b4WJ2tYcKQEs cwdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=iIaeyp+u; 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 n2si4370139edv.65.2022.02.08.03.31.27; Tue, 08 Feb 2022 03:31:53 -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=iIaeyp+u; 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 S244000AbiBGGPt (ORCPT + 99 others); Mon, 7 Feb 2022 01:15:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241182AbiBGEsI (ORCPT ); Sun, 6 Feb 2022 23:48:08 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF356C043181; Sun, 6 Feb 2022 20:48:07 -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 980B4210E8; Mon, 7 Feb 2022 04:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1644209286; 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=2w8E8+D8DnDn4oux4W6cKi7wJrd0JGZITu8BgcqO5/k=; b=iIaeyp+u+6up1G0hpe0ns8cxnMeE6N4td3CtAWY+xZIGV+UKST1UGVia/hjHjG3qOIcUAl giG/fcb7PceuAdwQKLhekiYjp3BTPoUdQH5hMxRU7sqNfqk/ybnfaJ4iMjn7mj5MFX1fWO 7Jh6V+gwtrKOjdzEU1rDx5podtWYG/E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1644209286; 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=2w8E8+D8DnDn4oux4W6cKi7wJrd0JGZITu8BgcqO5/k=; b=sb1QOGj4V3V8k41j+kPjQWi6J0FNHQBPDe3wYFw+hB7Sa78/4oiATv1segw7lCSXrSSAJV f8j/FpEi2KgcDMDw== 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 85BCC1330E; Mon, 7 Feb 2022 04:48:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QQM1EIOkAGJcNQAAMHmgww (envelope-from ); Mon, 07 Feb 2022 04:48:03 +0000 Subject: [PATCH 11/21] NFS: remove IS_SWAPFILE hack From: NeilBrown To: Trond Myklebust , Anna Schumaker , Chuck Lever , Andrew Morton , Mark Hemment , Christoph Hellwig , David Howells Cc: linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Mon, 07 Feb 2022 15:46:01 +1100 Message-ID: <164420916118.29374.2111079497808369007.stgit@noble.brown> In-Reply-To: <164420889455.29374.17958998143835612560.stgit@noble.brown> References: <164420889455.29374.17958998143835612560.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=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,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 9e2def045111..4d4750738aeb 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))