Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
fs/ntfs3: Use wait_on_buffer() directly
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>
authored by
Lalit Shankar Chowdhury
and committed by
Konstantin Komarov
fac760f5
f223ebff
+7
-17
+5
-11
fs/ntfs3/fsntfs.c
+5
-11
fs/ntfs3/fsntfs.c
···
875
875
return;
876
876
}
877
877
878
-
if (buffer_locked(bh2))
879
-
__wait_on_buffer(bh2);
880
-
878
+
wait_on_buffer(bh2);
881
879
lock_buffer(bh2);
882
880
memcpy(bh2->b_data, bh1->b_data, blocksize);
883
881
set_buffer_uptodate(bh2);
···
1067
1069
return -ENOMEM;
1068
1070
}
1069
1071
1070
-
if (buffer_locked(bh))
1071
-
__wait_on_buffer(bh);
1072
-
1072
+
wait_on_buffer(bh);
1073
1073
lock_buffer(bh);
1074
1074
if (buf) {
1075
1075
memcpy(bh->b_data + off, buf, op);
···
1343
1347
err = -ENOMEM;
1344
1348
goto out;
1345
1349
}
1346
-
if (buffer_locked(bh))
1347
-
__wait_on_buffer(bh);
1350
+
1351
+
wait_on_buffer(bh);
1348
1352
1349
1353
lock_buffer(bh);
1350
1354
if (!buffer_uptodate(bh))
···
1423
1427
if (op > bytes)
1424
1428
op = bytes;
1425
1429
1426
-
if (buffer_locked(bh))
1427
-
__wait_on_buffer(bh);
1428
-
1430
+
wait_on_buffer(bh);
1429
1431
lock_buffer(bh);
1430
1432
1431
1433
bh_data = bh->b_data + off;
+1
-3
fs/ntfs3/index.c
+1
-3
fs/ntfs3/index.c
+1
-3
fs/ntfs3/super.c
+1
-3
fs/ntfs3/super.c
···
1652
1652
*/
1653
1653
struct buffer_head *bh0 = sb_getblk(sb, 0);
1654
1654
if (bh0) {
1655
-
if (buffer_locked(bh0))
1656
-
__wait_on_buffer(bh0);
1657
-
1655
+
wait_on_buffer(bh0);
1658
1656
lock_buffer(bh0);
1659
1657
memcpy(bh0->b_data, boot2, sizeof(*boot2));
1660
1658
set_buffer_uptodate(bh0);