mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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 <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
529ae9aaa0
commit
ca5de404ff
9 changed files with 17 additions and 13 deletions
|
|
@ -1194,7 +1194,7 @@ lock_retry_remap:
|
|||
tbh = bhs[i];
|
||||
if (!tbh)
|
||||
continue;
|
||||
if (unlikely(test_set_buffer_locked(tbh)))
|
||||
if (!trylock_buffer(tbh))
|
||||
BUG();
|
||||
/* The buffer dirty state is now irrelevant, just clean it. */
|
||||
clear_buffer_dirty(tbh);
|
||||
|
|
|
|||
|
|
@ -665,7 +665,7 @@ lock_retry_remap:
|
|||
for (i = 0; i < nr_bhs; i++) {
|
||||
struct buffer_head *tbh = bhs[i];
|
||||
|
||||
if (unlikely(test_set_buffer_locked(tbh)))
|
||||
if (!trylock_buffer(tbh))
|
||||
continue;
|
||||
if (unlikely(buffer_uptodate(tbh))) {
|
||||
unlock_buffer(tbh);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue