From nobody Mon Dec 1 22:07:31 2025 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87AB3309DC4 for ; Fri, 28 Nov 2025 10:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764324849; cv=none; b=NIbQ2GTIa+FA9U9Q6q0ZRqdc2abgFJkffJ/G7J7wTlM+4C7HUHHeg3C3ocWBuFox6EBX7PSqZEZbqvTn8PGKBvVaBwauXxufduONPQEd/wO65e3Nd3bqqDfUjcL2QuBrqihv+T9WAwZtpwoOjXbQ12xfitCImkBQ+lxcIaBSBr4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764324849; c=relaxed/simple; bh=kVr6DBoa/bqfAwZkgZNONZ5a6MNtPx0ck2No19GrBEw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fzYYRdA/tyTbeqyk1YDCojAA25hoK/DfvaPUxpuBOtfuCUPNfTlF2hoeQ4GyuLC2HZYFgpK3S22rwxJQhhI28qNPNIQ/44iPApwMpOYtxMjdIwyfFzonWDVhFEp3JEfEnocKQ93JYIQyj4OWjGm6HbdiJSw7UDW8ZmcD+nTr3AA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gzknCaOO; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gzknCaOO" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-34372216275so1793862a91.2 for ; Fri, 28 Nov 2025 02:14:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764324847; x=1764929647; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yVuhVMY/nTuaFLZ3xpN4cW4yIYVl0+dcLUX2HVwBwT4=; b=gzknCaOOOza2SHfzAZKPPAYu1293fQLkWUamx1wE0hoiCzHRmr5qs53BxgeqHxyZAD cp1hVqIbuWC+Vk+vjjybXI+FWiofkbzszICYe/fWPkFtnOVjoZ5v1SxVGK6z9icnvdB9 gnyZgVdPzlS5m0WPimoeaPB7fx1QSEXXXPqZbYKLxE4rC0letmnR78jFReRYGkOtxxTn EYcb5JrAVWoclKvffXj4Kdy5fTVcB4/MvaNl8rOpO+NY7LIvw5Teo+oYcN4m+5j1gmWl ncAJm/5tnJqDn2QnWM57sr9vdiupL5R+qFY5BP4QIhbW1Y3tugoXevVYKhV8XJBfnUrd RR5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764324847; x=1764929647; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yVuhVMY/nTuaFLZ3xpN4cW4yIYVl0+dcLUX2HVwBwT4=; b=pOpI+YTqLlCyEr0IxmDMkSE17Mq8BUp5uTG90tEcV0A05Rwt22JzKFV+A1tTZqa6Wo RiMQW/9R7XylV+bx3YislnRxq4O6SUyuF7K2D6AD1Bm2H5cP+dr1qE8hdHPd9dlo8Wm/ sAIbbQ3mCSRVmQvMVID98O8pu/AJkgY6v/P0J4IARcNeto8VFnvuwmW2zQtUwqIfjDqQ zJ8+qtkTUbN0xNBgCEY1Wh7ybSmwsyvAyWAz44cRyye8NTIRU57N4onwO/J2tvHHtisi 3NRy4zNjdceQSeEeR87im1P3zG62vFkLx+9NtY+Vto6L0+hSLZH6y9t6y6p0M1RPecBj TA+g== X-Forwarded-Encrypted: i=1; AJvYcCU3j3D9RIho/IeXVPJOzt79SUVI2uLPJWbemuS5Q588LgMGK11AtF5dg7F1kirAayM1eMugytK8UuGW8oE=@vger.kernel.org X-Gm-Message-State: AOJu0YwpbF9Bs+0gHKTniigwHWtfBNybAEh/c/Sfj9hj8agByL54SrM3 6USy48C+m5AXmiLsD+CbswIrMPILPYTiX/mAIXGBbysTtD8TRGSr+seS X-Gm-Gg: ASbGncv9IzASiTCLEoQAheoz1j669MDDQNye0mzXCFBDMreMYDacZizH5ni/y9uVy6G dzgvc7pa/zvCYRF8k8lZBeeR7Exrzd0cWG5/lYiG8/zByzwO1cxv9z5tYT4Ir28RqnZbY0+W+Gv Vad/AwnEAq8fZKAuqscXao6Nbcqe6yQxBv1KCId4NLQbOA9qq5LP/d4TZgCgy8NeOeQjx/Ue3jX qMnBk9dT3GWxjYi3K4Jujcf3cIFgFyl9GJtpeGbBJrJykTV16U+v4+0oybALDy1z1Y9xbGY6bSL RxmIa16xtL/mnuMOAZl8/qTiUxh4AbO/9y5/1ka+7hcyNxsxiTDJbsN+8Ef+vEsmJ+MvlXznbTm NWCiUyIBiD7RI3VbaQMDjKWdk3fVncPHNSujlcFm2n+4p8fREOYuQMAP+OUw/wPJghriTiuCYxT //7L7qT/bqnXqLJOKeGUXXOK2V3AkXbEOgRMxSS5Y9Jg== X-Google-Smtp-Source: AGHT+IGPNQcoNeTmGBagvJ6Fu/LU8IZMnDRWO/fq/BjBDONgwBLHMQh5JHFx0V5ZcQr1wINP80B9gg== X-Received: by 2002:a17:90b:5628:b0:341:194:5e7c with SMTP id 98e67ed59e1d1-34733f2d700mr25570078a91.24.1764324846664; Fri, 28 Nov 2025 02:14:06 -0800 (PST) Received: from Dell-G15.SRMIST.EDU.IN ([104.28.225.172]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3475ff9fed2sm5421023a91.6.2025.11.28.02.14.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Nov 2025 02:14:06 -0800 (PST) From: Lalit Shankar Chowdhury To: almaz.alexandrovich@paragon-software.com Cc: ntfs3@lists.linux.dev, linux-kernel@vger.kernel.org, Lalit Shankar Chowdhury Subject: [PATCH] fs/ntfs3: Use wait_on_buffer() directly Date: Fri, 28 Nov 2025 10:12:56 +0000 Message-ID: <20251128101256.283353-1-lalitshankarch@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" wait_on_buffer() checks buffer_locked() internally before calling __wait_on_buffer(). Signed-off-by: Lalit Shankar Chowdhury --- fs/ntfs3/fsntfs.c | 15 ++++----------- fs/ntfs3/index.c | 4 +--- fs/ntfs3/super.c | 4 +--- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index c7a2f191254d..a6c155c691d6 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -875,9 +875,7 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int = wait) return; } =20 - if (buffer_locked(bh2)) - __wait_on_buffer(bh2); - + wait_on_buffer(bh2); lock_buffer(bh2); memcpy(bh2->b_data, bh1->b_data, blocksize); set_buffer_uptodate(bh2); @@ -1069,9 +1067,7 @@ int ntfs_sb_write(struct super_block *sb, u64 lbo, si= ze_t bytes, return -ENOMEM; } =20 - if (buffer_locked(bh)) - __wait_on_buffer(bh); - + wait_on_buffer(bh); lock_buffer(bh); if (buf) { memcpy(bh->b_data + off, buf, op); @@ -1347,8 +1343,7 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struc= t runs_tree *run, u64 vbo, err =3D -ENOMEM; goto out; } - if (buffer_locked(bh)) - __wait_on_buffer(bh); + wait_on_buffer(bh); set_buffer_uptodate(bh); } else { bh =3D ntfs_bread(sb, block); @@ -1420,9 +1415,7 @@ int ntfs_write_bh(struct ntfs_sb_info *sbi, struct NT= FS_RECORD_HEADER *rhdr, if (op > bytes) op =3D bytes; =20 - if (buffer_locked(bh)) - __wait_on_buffer(bh); - + wait_on_buffer(bh); lock_buffer(bh); =20 bh_data =3D bh->b_data + off; diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c index 6d1bf890929d..763fc05d3ca7 100644 --- a/fs/ntfs3/index.c +++ b/fs/ntfs3/index.c @@ -252,9 +252,7 @@ static int bmp_buf_get(struct ntfs_index *indx, struct = ntfs_inode *ni, =20 bbuf->bh =3D bh; =20 - if (buffer_locked(bh)) - __wait_on_buffer(bh); - + wait_on_buffer(bh); lock_buffer(bh); =20 sb =3D sbi->sb; diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index ddff94c091b8..bb6462d5569c 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -1616,9 +1616,7 @@ static int ntfs_fill_super(struct super_block *sb, st= ruct fs_context *fc) */ struct buffer_head *bh0 =3D sb_getblk(sb, 0); if (bh0) { - if (buffer_locked(bh0)) - __wait_on_buffer(bh0); - + wait_on_buffer(bh0); lock_buffer(bh0); memcpy(bh0->b_data, boot2, sizeof(*boot2)); set_buffer_uptodate(bh0); --=20 2.43.0