From patchwork Tue May 30 15:49:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 13260555 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 2923DC77B73 for ; Tue, 30 May 2023 15:50:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1313D90000C; Tue, 30 May 2023 11:49:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E02B900005; Tue, 30 May 2023 11:49:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE99F90000C; Tue, 30 May 2023 11:49:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DAEDF900005 for ; Tue, 30 May 2023 11:49:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B76E2A01D4 for ; Tue, 30 May 2023 15:49:58 +0000 (UTC) X-FDA: 80847357276.25.5EDA280 Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 6BA2E1A0021 for ; Tue, 30 May 2023 15:49:56 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=Yf4L+HYM; dmarc=pass (policy=quarantine) header.from=wdc.com; spf=pass (imf19.hostedemail.com: domain of "prvs=507b913ec=johannes.thumshirn@wdc.com" designates 68.232.143.124 as permitted sender) smtp.mailfrom="prvs=507b913ec=johannes.thumshirn@wdc.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685461796; 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=v0H6G01iGbarR6jkv3pBNWGf0keH7ufLZQ+rs2S4Px4=; b=0RWDyrzgZIn0t+WlZCzoBJTKoHw/1ypKkIJFRhfbEljwhIjbziZYvaLZtKHj/ROxR/wV7t 6U/mrvHc9Hs6d2ZdyWq58FCeaH4VKimpu0t7seQMCSsOV1Z0L8kkDQqlGuYHAMwfi87Ck1 sIx17Opu4M/KLbMvxR15JytPKu8kr9o= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=wdc.com header.s=dkim.wdc.com header.b=Yf4L+HYM; dmarc=pass (policy=quarantine) header.from=wdc.com; spf=pass (imf19.hostedemail.com: domain of "prvs=507b913ec=johannes.thumshirn@wdc.com" designates 68.232.143.124 as permitted sender) smtp.mailfrom="prvs=507b913ec=johannes.thumshirn@wdc.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685461796; a=rsa-sha256; cv=none; b=mneWXRX52w+DDU8h6TpaXU6LbWa0tgObB5vRTWBVtuLusRIfmFqFA4iCXMDyKk+Nkmk0P+ h+7EFMEpk+ha8DKMZxUl4WkpGcsdOAYv5ZGzVc1mqTt3SW6ZmkIWwP+6QAuKoQnbvOP0rd MODFAR/8Gf21H4OALY8n6FFo5jJXwz8= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1685461796; x=1716997796; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gSS6s+Y+KR0NN3bBjgfAzE61ZLWZg7T5kKisYNE42s8=; b=Yf4L+HYMaulRyMNExQqBIcbuZq6iNX8WbpjLzcr1AHYdjMJ/K6p7zfmX 94mGO5Y6q+nzwgLbeQZZV7X4Nbrqwyk2wjIU9ZwJxyx9kQD/oZB8iqfgN vl7r+gpeKYjR70qSCuOWCUkmM/LVd2YbHI2jBeHU6jREuQdE7BqWZ3ea/ XcHkaQuqV8O36KpYzJI8ROw7T3G3OPJj46bVRKIaNKUUx/HFzvn/mQ9t3 Jg/0uLNdryDNoAn0vuWo+O4kTyhZvrctwGiGgiTJWaLTMeWTDDdJLUFay kIbcvwFrEGwCMdsrwwIH37gXF1II90Ls3L+H+imL6oJ1+IgU5Sb9uLhWh A==; X-IronPort-AV: E=Sophos;i="6.00,204,1681142400"; d="scan'208";a="336465965" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 30 May 2023 23:49:53 +0800 IronPort-SDR: birqGSQPJBJ/0GuLzKEC9JxZ3WVaJC4es+lBKilC7fULp/GTWqQ0aQz9p8aPGTbmN7vp7Qi0rS JJyN6q0Lh5sYUhXgqfOchIdupjpfDMezk2CBzPF2MmkUzuLh7bVWNvOF36yCSro6ktaxa+80kC tAnEhJOU21e4m1R2pjhmY3BxlLPL9eqsFNxNDhdC7YhnXdhWaKCk6h/9LmzYQ2fA1wzvjBGyzi WYqrQdK/cO4iOXPYRFwlJEwjuqmHcSjIJ1ATwoRPxyJNjJEqdlDnkH3PJOrCFU6nOdjiY1KTqx 8Ec= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 30 May 2023 07:59:06 -0700 IronPort-SDR: zGTfFG0qpO3ekSs1jkbGf4NhCicS6v3Qh5GV0UwEUz6d58kwkQKUnQDffRvOn1PEv9wQNQpTvS L1oZuq/z0RSqONooE5ZtKTVt8hxkZujCOVwJhVMeym4kHlGOkhBiwzfmYNOjlDQQVkrsyxQ4tH p80L+3HwbQfc7Jh5sAenLjk04IkjBZOWxj0Hrxyd4f/4OoEOyS4v4abehlJeUA1wJ/hSkRbMfX MOJa9T2/0JxEuYE5ao9I9xF38mYJMK2+8AiT0scG/a3lHdVDEa8s97Vq0v8rwx5fkZZoJMlOnW T3A= WDCIronportException: Internal Received: from unknown (HELO redsun91.ssa.fujisawa.hgst.com) ([10.149.66.6]) by uls-op-cesaip02.wdc.com with ESMTP; 30 May 2023 08:49:51 -0700 From: Johannes Thumshirn To: Jens Axboe Cc: Christoph Hellwig , Hannes Reinecke , Chaitanya Kulkarni , Damien Le Moal , Ming Lei , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, dm-devel@redhat.com, Song Liu , linux-raid@vger.kernel.org, Mike Snitzer , Matthew Wilcox , Dave Kleikamp , jfs-discussion@lists.sourceforge.net, cluster-devel@redhat.com, Bob Peterson , Andreas Gruenbacher , Mikulas Patocka , gouhao@uniontech.com, Johannes Thumshirn , Damien Le Moal , Dave Kleikamp Subject: [PATCH v6 08/20] jfs: logmgr: use __bio_add_page to add single page to bio Date: Tue, 30 May 2023 08:49:11 -0700 Message-Id: <328ebcc2da2307aeb03ce17957a73547c1222e34.1685461490.git.johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 6BA2E1A0021 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: jjma4nu8s9ix6stw6o8z9s9uqxxicotx X-HE-Tag: 1685461796-261516 X-HE-Meta: U2FsdGVkX1+TyAU4D32T/GTga9f5DqQXwsz2dB/glcC96WJ6a+K5ivCQ/cIHTNM02gxYHQhDOE6WdGoxPT57EUgjMfkrwx5mrMerz+r6bxJouJ5antO+DaxrboXgew8Tr0pO9ulPHihT3Y0WS3n8l5XwEvY/Wostoch0dNwPiiy4ZkQZfTGcOhLGtMGrzwThxRrC59d8lcwj2NJtJcw5sAPBmUD3kOGwNRrJcc0nZbpz9qwzjcyBmNlhZ3fq2hSWIsCEoCXdS5ptIQPwcGKizcxND6TDa1RdQSg7+/HXSdwOdwwGNAJ/qk5xidA/6dcUYFJcYsdNXM1Pb+RiMS1Bfm1f4nGY26hgmKN3WHAxEp4S2ZF8qmcKyLcKRty3238ym9BTYPQH/6CcvjRW7YOWftrDkZc6wh6XeUEBkwlGj0xfgyxWO5auigi0nw5gUoKTBaLI/xigPVVfC5cw0kJdDxunm1gOh5GCfKwKZkflFFgAr3BZ1KGG5mvvAXsH9HDhfzap7R+cK5CclB1RSAJm4L6EioHoz/vMoLe40u1fvRb6E75ogN+oho2KrKOPisAQSWHJZ3boVP8SuWBCyE3Hu8UMefxJdtg7gNnpCPMe1eDqyUs3O3Ue55LeLEje5nmT2UM0C4YQ7/PcJ87SEfYq+uQ/be6txHPfSr2X6qnDEWyCFg0RtAov+epoqPWt5Qq/87XVSVBqavmHjo78KdpXVbDF+Ar3p+4OADxjVM2aKUIFwAZckQ8eAoFt8v2tEHo7JNE2Rw3X9IybwHhz7JD3ajUyZ+qGH3/ysj/TbgPcNeOy80T43Uu1I0HUhrxrTIKBhQm0iE11Nuyh5/6nxc5Ubsiqmq9D6yZtVYq1vyXHxYBLprSf0zGCyWI8HUhdVsfFZQwaAz9Xsp8QpIySm4bPLVLW71r8qQ4mqvi2hIC0vC7Z/1wBqhMIdmRJNnSDt9r/YF9ZP1y4EKiWYVqJNFl kPLLE0Mk 4tg7krEl0n1CM9NapHaLUqsqA/g9UxYRn4wJp2wi+3r1fMtiAIF8H236ReO5ihK7Bw6Vk0DyoFhHwennF1kIjWkgsEE80LUBL9pN0m7ngZAZNoToHhkgICyRh5nBEzcoTCCgwGkTBUkSn0enxKsVYvax+8NfoUB4UxuvzPtVk60Fw+Vyf56QGybie84328dBOd/bHAa4D7YvMqlVOXcA6GGmJt/HBczS5NyG/dnRhjrRbesshvEWFkXU0j8IuBCwx2mRUu1XJhO6lGiLnHmaTkraswUUMjl3wrDuVotSRS4WXniWVhBUn2ns+aJoVtFv/kLwLWxFFJYXm7LOv2pOG0W1teJDlPTLdUmoC3W0FtysstPfv17cfubfYtMUqjJtl6k2UJxoAi3xi1XrwtcE8MmdZajsp/rVOoyWcmlCGcS8xDkM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The JFS IO code uses bio_add_page() to add a page to a newly created bio. bio_add_page() can fail, but the return value is never checked. Use __bio_add_page() as adding a single page to a newly created bio is guaranteed to succeed. This brings us a step closer to marking bio_add_page() as __must_check. Reviewed-by: Damien Le Moal Acked-by: Dave Kleikamp Signed-off-by: Johannes Thumshirn Reviewed-by: Christoph Hellwig --- fs/jfs/jfs_logmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 695415cbfe98..15c645827dec 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -1974,7 +1974,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bio = bio_alloc(log->bdev, 1, REQ_OP_READ, GFP_NOFS); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); - bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); + __bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); bio->bi_end_io = lbmIODone; @@ -2115,7 +2115,7 @@ static void lbmStartIO(struct lbuf * bp) bio = bio_alloc(log->bdev, 1, REQ_OP_WRITE | REQ_SYNC, GFP_NOFS); bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9); - bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); + __bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset); BUG_ON(bio->bi_iter.bi_size != LOGPSIZE); bio->bi_end_io = lbmIODone;