Commit ed2b1d36 authored by David Sterba's avatar David Sterba
Browse files

btrfs: move btrfs_set_path_blocking to other locking functions 



The function belongs to the family of locking functions, so move it
there. The 'noinline' keyword is dropped as it's now an exported
function that does not need it.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 31f6e769

fs/btrfs/ctree.c

+0 −25
Original line number Diff line number Diff line
@@ -56,31 +56,6 @@ struct btrfs_path *btrfs_alloc_path(void) 
	return kmem_cache_zalloc(btrfs_path_cachep, GFP_NOFS);

}



/*

 * set all locked nodes in the path to blocking locks.  This should

 * be done before scheduling

 */

noinline void btrfs_set_path_blocking(struct btrfs_path *p)

{

	int i;

	for (i = 0; i < BTRFS_MAX_LEVEL; i++) {

		if (!p->nodes[i] || !p->locks[i])

			continue;

		/*

		 * If we currently have a spinning reader or writer lock this

		 * will bump the count of blocking holders and drop the

		 * spinlock.

		 */

		if (p->locks[i] == BTRFS_READ_LOCK) {

			btrfs_set_lock_blocking_read(p->nodes[i]);

			p->locks[i] = BTRFS_READ_LOCK_BLOCKING;

		} else if (p->locks[i] == BTRFS_WRITE_LOCK) {

			btrfs_set_lock_blocking_write(p->nodes[i]);

			p->locks[i] = BTRFS_WRITE_LOCK_BLOCKING;

		}

	}

}



/* this also releases the path */

void btrfs_free_path(struct btrfs_path *p)

{

fs/btrfs/locking.c

+26 −0
Original line number Diff line number Diff line
@@ -316,3 +316,29 @@ void btrfs_tree_unlock(struct extent_buffer *eb) 
		write_unlock(&eb->lock);

	}

}



/*

 * Set all locked nodes in the path to blocking locks.  This should be done

 * before scheduling

 */

void btrfs_set_path_blocking(struct btrfs_path *p)

{

	int i;



	for (i = 0; i < BTRFS_MAX_LEVEL; i++) {

		if (!p->nodes[i] || !p->locks[i])

			continue;

		/*

		 * If we currently have a spinning reader or writer lock this

		 * will bump the count of blocking holders and drop the

		 * spinlock.

		 */

		if (p->locks[i] == BTRFS_READ_LOCK) {

			btrfs_set_lock_blocking_read(p->nodes[i]);

			p->locks[i] = BTRFS_READ_LOCK_BLOCKING;

		} else if (p->locks[i] == BTRFS_WRITE_LOCK) {

			btrfs_set_lock_blocking_write(p->nodes[i]);

			p->locks[i] = BTRFS_WRITE_LOCK_BLOCKING;

		}

	}

}

fs/btrfs/locking.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ static inline void btrfs_assert_tree_locked(struct extent_buffer *eb) { 
static inline void btrfs_assert_tree_locked(struct extent_buffer *eb) { }

#endif



void btrfs_set_path_blocking(struct btrfs_path *p);



static inline void btrfs_tree_unlock_rw(struct extent_buffer *eb, int rw)

{

	if (rw == BTRFS_WRITE_LOCK || rw == BTRFS_WRITE_LOCK_BLOCKING)

CRA Git | Maintained and supported by SUSTech CRA and CCSE