From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B19A7C4707B for ; Mon, 15 Jan 2024 23:01:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F8996B0081; Mon, 15 Jan 2024 18:01:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DE2F6B0082; Mon, 15 Jan 2024 18:01:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30A5D6B0087; Mon, 15 Jan 2024 18:01:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F19596B0089 for ; Mon, 15 Jan 2024 18:01:25 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CA9C11C127A for ; Mon, 15 Jan 2024 23:01:25 +0000 (UTC) X-FDA: 81683068530.11.6CFAFB9 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf18.hostedemail.com (Postfix) with ESMTP id F3D511C0011 for ; Mon, 15 Jan 2024 23:01:23 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=lMeeXKAM; dmarc=pass (policy=quarantine) header.from=fromorbit.com; spf=pass (imf18.hostedemail.com: domain of david@fromorbit.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=david@fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705359684; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3LJife0DkUSCWANql4//DrwcmVy3A9Mu4G9yC26ZmxY=; b=bJXatoiSEp6a9E+ZtrHfXbQtYgYxlfbJNfQ1WbdpheTengCfsf5Z0CQjtTlgiLHDETFEFl z0VKasilrEZmPHCsomL6OUj1yysbOGqRdbeZHuCtu53vEKt8bhBftQiRwtKFYZ8kM53PUh IE3Nj2T9kY2PpRu22YprdzDyzmy1PSA= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=lMeeXKAM; dmarc=pass (policy=quarantine) header.from=fromorbit.com; spf=pass (imf18.hostedemail.com: domain of david@fromorbit.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=david@fromorbit.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705359684; a=rsa-sha256; cv=none; b=u1H3OXvFMKZtk5SzHE0Xm6cAyRriJt5d2d/ioLOHzlm+dbNmKWGrx/4N6vUpZ4jUehPMcB EITXS5nEeoW7s+S53BAbxE2TMYzJ1UURGHlLjohzcvBb7jL7oKNUp3kGbSzVKrbkTi+6Vi Sza4YIX2aArozY0W1MXEUNbp0BqdVvM= Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6d9f94b9186so7686733b3a.0 for ; Mon, 15 Jan 2024 15:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1705359683; x=1705964483; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3LJife0DkUSCWANql4//DrwcmVy3A9Mu4G9yC26ZmxY=; b=lMeeXKAMJ2nlkGb1sswnAu/o80AWeZSR8687jyQGgkcPFBFXPeRNy8f+1EfBVTipVZ UpBJnTguTdbbb4QE5ikyol/EcaVkei7ZR+nHs62qrZGxOlkOA4htt1G9AAIGMj88H08H b8VmIw1n0lGHAE+05m5/GwCa/po2kUMMYM03O/9gfuSNnpmgykyaN0WIzCB0+ZBkH0C6 slANpkI84Y0khOSxPPLmIoXyWoRafDdWqbwA+LpQrYURgOWVsQp6DCAG2lL8yWCEWjWX vGrpGtZ5gUy+cKC4NGmqmCcrXuhTfasGmcmQp5jHpIH/baVpNftkLZUIyF8xErHTDfUS Mw6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705359683; x=1705964483; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3LJife0DkUSCWANql4//DrwcmVy3A9Mu4G9yC26ZmxY=; b=g/lr/bjcuhaDKLOYqQWCMNzE4fNZ7i0wosNhu0dDWGLJAqVzE7pPbPgnsvpaw/xQw8 nmNsKV7pxY/hA7vSmXkWp4iIytp630WcDRHfZGBN7oJiOmbXCK8WCb65yI7hPY8SVIRl 2lnWdz2M5ZkC5YnMVJc8DnqFOWw7N3FZTaMaT6HXeg8ClYjyT2ooOMZJKDoOD1AjaIUE PTWsu31Ri3v7ZSi+LxEmuAzycNc4f0sXyw2pttvYL0ob8Cl4ufRZIG6GKWaBRaNxX2bz Ey55UiBbMUuSd9vMC0w4NZV9KrsSP3lFi+jDzr1DolETMEdDIybVd5gWhoQWymy2NLcm G++Q== X-Gm-Message-State: AOJu0YyT/LkDV8Z28qwr6Da1RfU3L6t7ZWVA6vakUrLlXZSjWKMBr0vo ri1eb2qlpU+1WBIDhBMlksdY6t1/IWVOy48ufRKNHlNV5+A= X-Google-Smtp-Source: AGHT+IHuvnJ8hiLAOei7LMgoGrEcANGg1wnR1tJpH4QRdpptY/qungv5tMun/Ja8vcEiUVKBDoAqbg== X-Received: by 2002:a62:8142:0:b0:6d9:8d46:814b with SMTP id t63-20020a628142000000b006d98d46814bmr7449168pfd.20.1705359682966; Mon, 15 Jan 2024 15:01:22 -0800 (PST) Received: from dread.disaster.area (pa49-180-249-6.pa.nsw.optusnet.com.au. [49.180.249.6]) by smtp.gmail.com with ESMTPSA id b12-20020aa78ecc000000b006db105027basm8081256pfr.50.2024.01.15.15.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 15:01:19 -0800 (PST) Received: from [192.168.253.23] (helo=devoid.disaster.area) by dread.disaster.area with esmtp (Exim 4.96) (envelope-from ) id 1rPVxE-00AtKW-18; Tue, 16 Jan 2024 10:01:15 +1100 Received: from dave by devoid.disaster.area with local (Exim 4.97) (envelope-from ) id 1rPVxD-0000000H8gB-3MLa; Tue, 16 Jan 2024 10:01:15 +1100 From: Dave Chinner To: linux-xfs@vger.kernel.org Cc: willy@infradead.org, linux-mm@kvack.org Subject: [PATCH 11/12] xfs: clean up remaining GFP_NOFS users Date: Tue, 16 Jan 2024 09:59:49 +1100 Message-ID: <20240115230113.4080105-12-david@fromorbit.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240115230113.4080105-1-david@fromorbit.com> References: <20240115230113.4080105-1-david@fromorbit.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F3D511C0011 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 1nnoogexm67nnjcygyotgmmpcso3kfxm X-HE-Tag: 1705359683-115558 X-HE-Meta: U2FsdGVkX198vqE6LyxK5mteyA1wlkTVDajrvyGs1j3jx+HGR/GkVD15Ib8k1qp31AdXBJ66trhaxZBnkhl9r/ofSocWWaejgyQHZDtg+cvPBEEKU21ETYZBS/YNZkpv99yfrwdLdbF7xFWk2UkF36Obeyqwjz9uW95u7wMl63y2Q1n699zDEOofIT6XRPG88VTllTJ3yCX9PWFyAngRHiD2Wk5/J8dyW3it9ZPSCxPoh5Fw5ROBmoD+6QlK0S3atUAQLtTfu4z6xqhsgYE2BR5N3rPUEKJHAipR5pWRO6lTDTHz0zN1ni7HBSQ6S5X8i18w9HGPAT5ZP0u07nbF6eMyXItgPzzkYCgVP3GRmZPoPZ+Cz8280YhE6vzMJ/IDNGZWJN1eWpykcRY4Jx/RCA0LSitzOxUjol7gu65+fMOHZBRMOitBvQnEpPkMC22kR4DMKMkAvWODJTVZtoMC2ymR7N3k1Pg5toFRUSN/jelnYkKU89TFlruPc7f2L3KGpCTJvYFu1Rpr/vUjaSNxSJf2c710arfdhbl0ox274WuQ1jPM7mf6ZGO92VuNw36G9URQ9B2uLk6UywD1CsKKf8/75r2L6N0FY8rl+U/Z9SjSJVvgUhuI5fZ3D1+ViPh3wqfTEjTnVt8wuxGbOgg3m50xjlnq3rXkk3bBPy59m4w0oRnYedxpgBDNwjO2a52n9w2HPTrGac5SjWfm1rsYILI/8xhxMAAPp1OMgMPpK8sywoJMHR4GO0USSLJqQesAROA5yRvMH5zL8+CSylo0QDmmqw95Z0YPX6NycJUzmYmRgJ0eW0JhUOTxohzQS7jQoW58Uce9iq6rS/QUmlC5fZKvFOgUbqsZE8q6bVpQcPymDaKZrrwX8PtQ1t4Cj4FqcYZUGa87cceuczJldQPetA44ABLkmEGKmgBeNMvCjlJyRWXgxwlgrX76/JRP7fYZ6I2qxWOQchvquLvjdYZ uWyoRE6y 8zpePQIyDnCFRdyEuZq0bAJrAlHkKcyXUlzlOvCdgvThK+D//lYQKnpIVeq6hESQRPhAwbutNGBshUp3pOWuFFoHl2QwSJRnvXQNB0z/4WxTZ10tWU8LCDr7JwbgdlhSiahb8/vYl8jpyj7nAtaO1pxONvL7WNZt7ITGI26GzHhkcYgW5Y0WvMRRGRDWQAeCcUE3LvhwywuzjHmUINqKlR25GqR2FWXJeTiqEzX25C4p54uXjQ1t+mqaF3FpJCB+KU6ZFX/6mtivwjztc4obXq7NAUClIfdue1OqEk4m0z5J9Ojwd5fz77/TSO2XQ7hQGOShR3fd22jDisKXxpiFVgXW+kzXgTEgVdc8lDwrR55KL6U+RRLELkUURY1FNxH8RomuWmrxuOshva8B0+L2OZXw1Ks2qd4ZqC1YnvdR3Choh5DeHwSKVl8TAdyW8ePh4991obWSmrjcizd5F8QPJLTjIbqE0U4kOcYFYU3NeLB7K2ShCdMjhC7h93K+ywCBrVpFbppwwv7ZeEoios0cTAyroGA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000098, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Dave Chinner These few remaining GFP_NOFS callers do not need to use GFP_NOFS at all. They are only called from a non-transactional context or cannot be accessed from memory reclaim due to other constraints. Hence they can just use GFP_KERNEL. Signed-off-by: Dave Chinner --- fs/xfs/libxfs/xfs_btree_staging.c | 4 ++-- fs/xfs/xfs_attr_list.c | 2 +- fs/xfs/xfs_buf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_btree_staging.c b/fs/xfs/libxfs/xfs_btree_staging.c index 961f6b898f4b..f0c69f9bb169 100644 --- a/fs/xfs/libxfs/xfs_btree_staging.c +++ b/fs/xfs/libxfs/xfs_btree_staging.c @@ -139,7 +139,7 @@ xfs_btree_stage_afakeroot( ASSERT(!(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE)); ASSERT(cur->bc_tp == NULL); - nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_NOFS | __GFP_NOFAIL); + nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_KERNEL | __GFP_NOFAIL); memcpy(nops, cur->bc_ops, sizeof(struct xfs_btree_ops)); nops->alloc_block = xfs_btree_fakeroot_alloc_block; nops->free_block = xfs_btree_fakeroot_free_block; @@ -220,7 +220,7 @@ xfs_btree_stage_ifakeroot( ASSERT(cur->bc_flags & XFS_BTREE_ROOT_IN_INODE); ASSERT(cur->bc_tp == NULL); - nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_NOFS | __GFP_NOFAIL); + nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_KERNEL | __GFP_NOFAIL); memcpy(nops, cur->bc_ops, sizeof(struct xfs_btree_ops)); nops->alloc_block = xfs_btree_fakeroot_alloc_block; nops->free_block = xfs_btree_fakeroot_free_block; diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index 0318d768520a..47453510c0ab 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c @@ -109,7 +109,7 @@ xfs_attr_shortform_list( * It didn't all fit, so we have to sort everything on hashval. */ sbsize = sf->count * sizeof(*sbuf); - sbp = sbuf = kmalloc(sbsize, GFP_NOFS | __GFP_NOFAIL); + sbp = sbuf = kmalloc(sbsize, GFP_KERNEL | __GFP_NOFAIL); /* * Scan the attribute list for the rest of the entries, storing diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index de99368000b4..08f2fbc04db5 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -2008,7 +2008,7 @@ xfs_alloc_buftarg( #if defined(CONFIG_FS_DAX) && defined(CONFIG_MEMORY_FAILURE) ops = &xfs_dax_holder_operations; #endif - btp = kzalloc(sizeof(*btp), GFP_NOFS | __GFP_NOFAIL); + btp = kzalloc(sizeof(*btp), GFP_KERNEL | __GFP_NOFAIL); btp->bt_mount = mp; btp->bt_bdev_handle = bdev_handle; -- 2.43.0