fs: rename buffer trylock
Like the page lock change, this also requires name change, so convert the raw test_and_set bitop to a trylock. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
529ae9aaa0
commit
ca5de404ff
@@ -586,7 +586,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
|
||||
for (i_bhs = 0; i_bhs < nr_bhs; i_bhs++) {
|
||||
struct buffer_head *tbh = bhs[i_bhs];
|
||||
|
||||
if (unlikely(test_set_buffer_locked(tbh)))
|
||||
if (!trylock_buffer(tbh))
|
||||
BUG();
|
||||
BUG_ON(!buffer_uptodate(tbh));
|
||||
clear_buffer_dirty(tbh);
|
||||
@@ -779,7 +779,7 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync)
|
||||
for (i_bhs = 0; i_bhs < nr_bhs; i_bhs++) {
|
||||
struct buffer_head *tbh = bhs[i_bhs];
|
||||
|
||||
if (unlikely(test_set_buffer_locked(tbh)))
|
||||
if (!trylock_buffer(tbh))
|
||||
BUG();
|
||||
BUG_ON(!buffer_uptodate(tbh));
|
||||
clear_buffer_dirty(tbh);
|
||||
|
Reference in New Issue
Block a user