Commit 7266f0a6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

fs/bcachefs: Fix __wait_on_freeing_inode() definition of waitqueue entry 



The following recent commit made DEFINE_WAIT_BIT() type requirements stricter:

  2382d68d ("sched: change wake_up_bit() and related function to expect unsigned long *")

.. which results in a build failure:

  > fs/bcachefs/fs.c: In function '__wait_on_freeing_inode':
  > fs/bcachefs/fs.c:281:31: error: initialization of 'long unsigned int *' from incompatible pointer type 'u32 *' {aka 'unsigned int *'} [-Wincompatible-pointer-types]
  >   281 |         DEFINE_WAIT_BIT(wait, &inode->v.i_state, __I_NEW);

Since this code relies on the waitqueue initialization within
inode_bit_waitqueue() anyway, the DEFINE_WAIT_BIT() initialization
is unnecessary - we can just declare a waitqueue entry.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0ac8f14e

fs/bcachefs/fs.c

+2 −1
Original line number Diff line number Diff line
@@ -183,8 +183,9 @@ static void __wait_on_freeing_inode(struct bch_fs *c, 
				    struct bch_inode_info *inode,

				    subvol_inum inum)

{

	struct wait_bit_queue_entry wait;

	wait_queue_head_t *wq;

	DEFINE_WAIT_BIT(wait, &inode->v.i_state, __I_NEW);



	wq = inode_bit_waitqueue(&wait, &inode->v, __I_NEW);

	prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);

	spin_unlock(&inode->v.i_lock);