Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d00689af6b3b6ba9e1fdefec3bd62edc860c385d

Authored by Zach Brown
Committed by Linus Torvalds
1 parent 20dcae3243
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] aio: replace locking comments with assert_spin_locked() 

aio: replace locking comments with assert_spin_locked()

Signed-off-by: Zach Brown <zach.brown@oracle.com>
Acked-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 12 additions and 5 deletions Side-by-side Diff

... ... @@ -457,6 +457,8 @@
457 457  
458 458 static inline void really_put_req(struct kioctx *ctx, struct kiocb *req)
459 459 {
  460 + assert_spin_locked(&ctx->ctx_lock);
  461 +
460 462 if (req->ki_dtor)
461 463 req->ki_dtor(req);
462 464 kmem_cache_free(kiocb_cachep, req);
... ... @@ -498,6 +500,8 @@
498 500 dprintk(KERN_DEBUG "aio_put(%p): f_count=%d\n",
499 501 req, atomic_read(&req->ki_filp->f_count));
500 502  
  503 + assert_spin_locked(&ctx->ctx_lock);
  504 +
501 505 req->ki_users --;
502 506 if (unlikely(req->ki_users < 0))
503 507 BUG();
504 508  
... ... @@ -619,14 +623,13 @@
619 623 * the kiocb (to tell the caller to activate the work
620 624 * queue to process it), or 0, if it found that it was
621 625 * already queued.
622   - *
623   - * Should be called with the spin lock iocb->ki_ctx->ctx_lock
624   - * held
625 626 */
626 627 static inline int __queue_kicked_iocb(struct kiocb *iocb)
627 628 {
628 629 struct kioctx *ctx = iocb->ki_ctx;
629 630  
  631 + assert_spin_locked(&ctx->ctx_lock);
  632 +
630 633 if (list_empty(&iocb->ki_run_list)) {
631 634 list_add_tail(&iocb->ki_run_list,
632 635 &ctx->run_list);
633 636  
... ... @@ -771,13 +774,15 @@
771 774 * Process all pending retries queued on the ioctx
772 775 * run list.
773 776 * Assumes it is operating within the aio issuer's mm
774   - * context. Expects to be called with ctx->ctx_lock held
  777 + * context.
775 778 */
776 779 static int __aio_run_iocbs(struct kioctx *ctx)
777 780 {
778 781 struct kiocb *iocb;
779 782 LIST_HEAD(run_list);
780 783  
  784 + assert_spin_locked(&ctx->ctx_lock);
  785 +
781 786 list_splice_init(&ctx->run_list, &run_list);
782 787 while (!list_empty(&run_list)) {
783 788 iocb = list_entry(run_list.next, struct kiocb,
784 789  
... ... @@ -1604,12 +1609,14 @@
1604 1609  
1605 1610 /* lookup_kiocb
1606 1611 * Finds a given iocb for cancellation.
1607   - * MUST be called with ctx->ctx_lock held.
1608 1612 */
1609 1613 static struct kiocb *lookup_kiocb(struct kioctx *ctx, struct iocb __user *iocb,
1610 1614 u32 key)
1611 1615 {
1612 1616 struct list_head *pos;
  1617 +
  1618 + assert_spin_locked(&ctx->ctx_lock);
  1619 +
1613 1620 /* TODO: use a hash or array, this sucks. */
1614 1621 list_for_each(pos, &ctx->active_reqs) {
1615 1622 struct kiocb *kiocb = list_kiocb(pos);