Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3393903pxb; Mon, 24 Jan 2022 08:42:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtXViJE+CvT0ox8BfjqDlX4C40O2u7yARgU42kIMjYpVmJcmlKQvcv7D4UNdNtMeGH5gu6 X-Received: by 2002:a17:902:b949:b0:14a:b3e8:6a25 with SMTP id h9-20020a170902b94900b0014ab3e86a25mr15161215pls.29.1643042525244; Mon, 24 Jan 2022 08:42:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643042525; cv=none; d=google.com; s=arc-20160816; b=Cikod8o92ZmFpS7xleUgnOomCY+3ms91iggs8S/2pZCj0lhG6soDnv1xpFahB3bjMm Epv40V2ZybxBcqAwLnfLkUWorN0WkORcwtjQEbf9YFHQ5sKsppdFm1bOi4/Jibpfk3FX 1zHG3rLJHeE6tSfXnHOLw51kX9OnO43ovKgn3j/WQIKrkXSiNpKTTq+mL9iCiAuoKFFm WQmLptVGeHuGdrcaIV36KpkuFuQtpz1TRYO3B/gg+jRIw+tmQt9oW0SMnNQnNgpHVvvk qbe2YUDM3Umkydye06m61xi6aYCmmB492dePVAREd6XvcUdH3QrNP3s/8NbE1hhSRwG6 Q12A== 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=w8lR7J8JNn9z3HgJi0/q20xbPjyDJKVj8xh3UiEzhOQ=; b=UXBcsv0toWqm97LliET6CHE9lWoeMrRuGFcGmEAHAuqi3U/UZiikX4SijYh1JSb5J3 1vy03fQwH596Wrz9qIBIxUwLDx5IHM2nZ9wSHXXmOsvw97SpC1U17Hylm8JEoUYYNSch y+rXQiZm/4UNyi9CbIsllQ4n+Ve8hHryYmxJQ3k06qVbJyZDyWTOFkhnomUGksAoUVhb Rm8nvRHC8luD4+qnbBAYBmjxa7NHuK8yJP+nMfXP0I8omZaXHwI5hvBekO16ZZkScwCJ sp2r1SJKptbKoyJ3g3FFEBuGBrw8RUGycmV1hDui/3Yi1tul+cmhmdy+cAziInZHfGrl cmgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=BIFtq0Wx; dkim=neutral (no key) header.i=@suse.de header.b=T7wT1d1q; 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=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n14si9527846plf.496.2022.01.24.08.41.44; Mon, 24 Jan 2022 08:42:05 -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=@suse.de header.s=susede2_rsa header.b=BIFtq0Wx; dkim=neutral (no key) header.i=@suse.de header.b=T7wT1d1q; 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=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241204AbiAXDxK (ORCPT + 99 others); Sun, 23 Jan 2022 22:53:10 -0500 Received: from smtp-out1.suse.de ([195.135.220.28]:56866 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241200AbiAXDxK (ORCPT ); Sun, 23 Jan 2022 22:53:10 -0500 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 E11EA21997; Mon, 24 Jan 2022 03:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1642996388; 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=w8lR7J8JNn9z3HgJi0/q20xbPjyDJKVj8xh3UiEzhOQ=; b=BIFtq0WxNoK33RbSSnkbhn7EkwZIJe9uuHRxyCZ03NZ7aYWSjcVp24hiAUh1n0iZ2FW66L KiFctLtDEFU4K29rI7mnmXznzvDMex258aT9xsPPVtAk0JwooEtTFgRa2cnmEDBVQaOpA0 MSFdLM9c+p5eGfwo5yPWmePVfpPljq0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1642996388; 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=w8lR7J8JNn9z3HgJi0/q20xbPjyDJKVj8xh3UiEzhOQ=; b=T7wT1d1qNNR2PFPLlpZBeDaBKmfxRWNTJgT+STJswMATGxn3qssrMiMMOHHdaw5UYROrSd 59Joc+ibKdu2eGBw== 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 D33C113305; Mon, 24 Jan 2022 03:53:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XkU8I6Ei7mGURQAAMHmgww (envelope-from ); Mon, 24 Jan 2022 03:53:05 +0000 Subject: [PATCH 12/23] NFS: remove IS_SWAPFILE hack From: NeilBrown To: Trond Myklebust , Anna Schumaker , Chuck Lever , Andrew Morton , Mel Gorman , Christoph Hellwig , David Howells Cc: linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Mon, 24 Jan 2022 14:48:32 +1100 Message-ID: <164299611280.26253.6924680050876339981.stgit@noble.brown> In-Reply-To: <164299573337.26253.7538614611220034049.stgit@noble.brown> References: <164299573337.26253.7538614611220034049.stgit@noble.brown> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 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))