github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

fs/ntfs3: Use wait_on_buffer() directly

Browse Source 
wait_on_buffer() checks buffer_locked() internally
before calling __wait_on_buffer().

Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Lalit Shankar Chowdhury 2025-11-28 10:12:56 +00:00 committed by Konstantin Komarov
parent f223ebffa1
commit fac760f524
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ntfs3/fsntfs.c
View File

@ -875,9 +875,7 @@ void ntfs_update_mftmirr(struct ntfs_sb_info *sbi, int wait)
return;
}
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, size_t bytes,
return -ENOMEM;
}
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,8 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struct runs_tree *run, u64 vbo,
err = -ENOMEM;
goto out;
}
if (buffer_locked(bh))
__wait_on_buffer(bh);
wait_on_buffer(bh);
lock_buffer(bh);
if (!buffer_uptodate(bh))
@ -1427,9 +1423,7 @@ int ntfs_write_bh(struct ntfs_sb_info *sbi, struct NTFS_RECORD_HEADER *rhdr,
if (op > bytes)
op = bytes;
if (buffer_locked(bh))
__wait_on_buffer(bh);
wait_on_buffer(bh);
lock_buffer(bh);
bh_data = bh->b_data + off;

4
fs/ntfs3/index.c
View File

@ -252,9 +252,7 @@ static int bmp_buf_get(struct ntfs_index *indx, struct ntfs_inode *ni,
bbuf->bh = bh;
if (buffer_locked(bh))
__wait_on_buffer(bh);
wait_on_buffer(bh);
lock_buffer(bh);
sb = sbi->sb;

4
fs/ntfs3/super.c
View File

@ -1652,9 +1652,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
*/
struct buffer_head *bh0 = 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);