Skip to content

Commit

Permalink
RDMA/uverbs: Remove is_closed from ib_uverbs_file
Browse files Browse the repository at this point in the history
This does nothing but indicate if the uverbs_file is in the device's list,
use list_del_init instead.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
  • Loading branch information
Jason Gunthorpe committed Sep 19, 2018
1 parent 9a59739 commit 6ebce44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion drivers/infiniband/core/uverbs.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ struct ib_uverbs_file {
struct ib_event_handler event_handler;
struct ib_uverbs_async_event_file *async_file;
struct list_head list;
int is_closed;

/*
* To access the uobjects list hw_destroy_rwsem must be held for write
Expand Down
8 changes: 2 additions & 6 deletions drivers/infiniband/core/uverbs_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -905,10 +905,7 @@ static int ib_uverbs_close(struct inode *inode, struct file *filp)
uverbs_destroy_ufile_hw(file, RDMA_REMOVE_CLOSE);

mutex_lock(&file->device->lists_mutex);
if (!file->is_closed) {
list_del(&file->list);
file->is_closed = 1;
}
list_del_init(&file->list);
mutex_unlock(&file->device->lists_mutex);

if (file->async_file)
Expand Down Expand Up @@ -1104,8 +1101,7 @@ static void ib_uverbs_free_hw_resources(struct ib_uverbs_device *uverbs_dev,
while (!list_empty(&uverbs_dev->uverbs_file_list)) {
file = list_first_entry(&uverbs_dev->uverbs_file_list,
struct ib_uverbs_file, list);
file->is_closed = 1;
list_del(&file->list);
list_del_init(&file->list);
kref_get(&file->ref);

/* We must release the mutex before going ahead and calling
Expand Down

0 comments on commit 6ebce44

Please sign in to comment.