diff options
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_keys.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c index aa33b0e9f2f6..5ae8761f9dd2 100644 --- a/drivers/infiniband/hw/ipath/ipath_keys.c +++ b/drivers/infiniband/hw/ipath/ipath_keys.c | |||
| @@ -136,9 +136,7 @@ int ipath_lkey_ok(struct ipath_lkey_table *rkt, struct ipath_sge *isge, | |||
| 136 | ret = 1; | 136 | ret = 1; |
| 137 | goto bail; | 137 | goto bail; |
| 138 | } | 138 | } |
| 139 | spin_lock(&rkt->lock); | ||
| 140 | mr = rkt->table[(sge->lkey >> (32 - ib_ipath_lkey_table_size))]; | 139 | mr = rkt->table[(sge->lkey >> (32 - ib_ipath_lkey_table_size))]; |
| 141 | spin_unlock(&rkt->lock); | ||
| 142 | if (unlikely(mr == NULL || mr->lkey != sge->lkey)) { | 140 | if (unlikely(mr == NULL || mr->lkey != sge->lkey)) { |
| 143 | ret = 0; | 141 | ret = 0; |
| 144 | goto bail; | 142 | goto bail; |
| @@ -184,8 +182,6 @@ bail: | |||
| 184 | * @acc: access flags | 182 | * @acc: access flags |
| 185 | * | 183 | * |
| 186 | * Return 1 if successful, otherwise 0. | 184 | * Return 1 if successful, otherwise 0. |
| 187 | * | ||
| 188 | * The QP r_rq.lock should be held. | ||
| 189 | */ | 185 | */ |
| 190 | int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, | 186 | int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, |
| 191 | u32 len, u64 vaddr, u32 rkey, int acc) | 187 | u32 len, u64 vaddr, u32 rkey, int acc) |
| @@ -196,9 +192,7 @@ int ipath_rkey_ok(struct ipath_ibdev *dev, struct ipath_sge_state *ss, | |||
| 196 | size_t off; | 192 | size_t off; |
| 197 | int ret; | 193 | int ret; |
| 198 | 194 | ||
| 199 | spin_lock(&rkt->lock); | ||
| 200 | mr = rkt->table[(rkey >> (32 - ib_ipath_lkey_table_size))]; | 195 | mr = rkt->table[(rkey >> (32 - ib_ipath_lkey_table_size))]; |
| 201 | spin_unlock(&rkt->lock); | ||
| 202 | if (unlikely(mr == NULL || mr->lkey != rkey)) { | 196 | if (unlikely(mr == NULL || mr->lkey != rkey)) { |
| 203 | ret = 0; | 197 | ret = 0; |
| 204 | goto bail; | 198 | goto bail; |
