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

Commit 203e02d9 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: remove unused wait in btrfs_stripe_hash 



In fact nobody is waiting on @wait's waitqueue, it can be safely
removed.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 36f7894f

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ enum btrfs_orphan_cleanup_state { 
/* used by the raid56 code to lock stripes for read/modify/write */

struct btrfs_stripe_hash {

	struct list_head hash_list;

	wait_queue_head_t wait;

	spinlock_t lock;

};

fs/btrfs/raid56.c

+0 −10
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info) 
		cur = h + i;

		INIT_LIST_HEAD(&cur->hash_list);

		spin_lock_init(&cur->lock);

		init_waitqueue_head(&cur->wait);

	}



	x = cmpxchg(&info->stripe_hash_table, NULL, table);
@@ -815,15 +814,6 @@ static noinline void unlock_stripe(struct btrfs_raid_bio *rbio) 
			}



			goto done_nolock;

			/*

			 * The barrier for this waitqueue_active is not needed,

			 * we're protected by h->lock and can't miss a wakeup.

			 */

		} else if (waitqueue_active(&h->wait)) {

			spin_unlock(&rbio->bio_list_lock);

			spin_unlock_irqrestore(&h->lock, flags);

			wake_up(&h->wait);

			goto done_nolock;

		}

	}

done: