nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

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

  2382d68d7d ("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: Stephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2024-10-09 10:00:09 +02:00
parent 0ac8f14ef2
commit 7266f0a6d3
1 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
fs/bcachefs/fs.c
View file

@ -183,8 +183,9 @@ static void __wait_on_freeing_inode(struct bch_fs *c,
struct bch_inode_info *inode, struct bch_inode_info *inode,
subvol_inum inum) subvol_inum inum)
{ {
struct wait_bit_queue_entry wait;
wait_queue_head_t *wq; wait_queue_head_t *wq;
DEFINE_WAIT_BIT(wait, &inode->v.i_state, __I_NEW);
wq = inode_bit_waitqueue(&wait, &inode->v, __I_NEW); wq = inode_bit_waitqueue(&wait, &inode->v, __I_NEW);
prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE); prepare_to_wait(wq, &wait.wq_entry, TASK_UNINTERRUPTIBLE);
spin_unlock(&inode->v.i_lock); spin_unlock(&inode->v.i_lock);