Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / net / rds / ib_mr.h

diff --git a/net/rds/ib_mr.h b/net/rds/ib_mr.h
index 5da12c2484316cbbde5c33b254d86b061c1b187e..9045a8c0edfff11e2d69e0c4d1846ca8cfde4869 100644 (file)
--- a/net/rds/ib_mr.h
+++ b/net/rds/ib_mr.h
@@ -57,6 +57,9 @@ struct rds_ib_frmr {
        struct ib_mr            *mr;
        enum rds_ib_fr_state    fr_state;
        bool                    fr_inv;
+       wait_queue_head_t       fr_inv_done;
+       bool                    fr_reg;
+       wait_queue_head_t       fr_reg_done;
        struct ib_send_wr       fr_wr;
        unsigned int            dma_npages;
        unsigned int            sg_byte_len;
@@ -97,6 +100,7 @@ struct rds_ib_mr_pool {
        struct llist_head       free_list;      /* unused MRs */
        struct llist_head       clean_list;     /* unused & unmapped MRs */
        wait_queue_head_t       flush_wait;
+       spinlock_t              clean_lock;     /* "clean_list" concurrency */
 
        atomic_t                free_pinned;    /* memory pinned by free MRs */
        unsigned long           max_items;