Re: [PATCH 3/9] io-wq: update check condition for lock

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



在 2021/11/25 下午10:47, Pavel Begunkov 写道:
On 11/24/21 04:46, Hao Xu wrote:
Update sparse check since we changed the lock.

Shouldn't it be a part of one of the previous patches?
Sure, that would be better.


Signed-off-by: Hao Xu <haoxu@xxxxxxxxxxxxxxxxx>
---
  fs/io-wq.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 26ccc04797b7..443c34d9b326 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -378,7 +378,6 @@ static bool io_queue_worker_create(struct io_worker *worker,
  }
  static void io_wqe_dec_running(struct io_worker *worker)
-    __must_hold(wqe->lock)
  {
      struct io_wqe_acct *acct = io_wqe_get_acct(worker);
      struct io_wqe *wqe = worker->wqe;
@@ -449,7 +448,7 @@ static void io_wait_on_hash(struct io_wqe *wqe, unsigned int hash)
  static struct io_wq_work *io_get_next_work(struct io_wqe_acct *acct,
                         struct io_worker *worker)
-    __must_hold(wqe->lock)
+    __must_hold(acct->lock)
  {
      struct io_wq_work_node *node, *prev;
      struct io_wq_work *work, *tail;
@@ -523,7 +522,6 @@ static void io_assign_current_work(struct io_worker *worker,   static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work);
  static void io_worker_handle_work(struct io_worker *worker)
-    __releases(wqe->lock)
  {
      struct io_wqe_acct *acct = io_wqe_get_acct(worker);
      struct io_wqe *wqe = worker->wqe;
@@ -986,7 +984,6 @@ static inline void io_wqe_remove_pending(struct io_wqe *wqe,
  static bool io_acct_cancel_pending_work(struct io_wqe *wqe,
                      struct io_wqe_acct *acct,
                      struct io_cb_cancel_data *match)
-    __releases(wqe->lock)
  {
      struct io_wq_work_node *node, *prev;
      struct io_wq_work *work;






[Index of Archives]     [Linux Samsung SoC]     [Linux Rockchip SoC]     [Linux Actions SoC]     [Linux for Synopsys ARC Processors]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]


  Powered by Linux