Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5de404 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

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: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 529ae9aa

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1720,7 +1720,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page, 
		 */

		if (wbc->sync_mode != WB_SYNC_NONE || !wbc->nonblocking) {

			lock_buffer(bh);

		} else if (test_set_buffer_locked(bh)) {

		} else if (!trylock_buffer(bh)) {

			redirty_page_for_writepage(wbc, page);

			continue;

		}
@@ -3000,7 +3000,7 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[]) 


		if (rw == SWRITE || rw == SWRITE_SYNC)

			lock_buffer(bh);

		else if (test_set_buffer_locked(bh))

		else if (!trylock_buffer(bh))

			continue;



		if (rw == WRITE || rw == SWRITE || rw == SWRITE_SYNC) {

fs/jbd/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int journal_submit_data_buffers(journal_t *journal, 
		 * blocking lock_buffer().

		 */

		if (buffer_dirty(bh)) {

			if (test_set_buffer_locked(bh)) {

			if (!trylock_buffer(bh)) {

				BUFFER_TRACE(bh, "needs blocking lock");

				spin_unlock(&journal->j_list_lock);

				/* Write out all data to prevent deadlocks */

fs/ntfs/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static int ntfs_write_mst_block(struct page *page, 
		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);

fs/ntfs/compress.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ int ntfs_read_compressed_block(struct page *page) 
	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);

fs/ntfs/mft.c

+2 −2
Original line number Diff line number Diff line
@@ -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);