diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2018-07-29 11:34:51 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-08-03 05:19:41 +0300 |
| commit | 577e07ffbad9960551a6821b74af90a216ac10e2 (patch) | |
| tree | e9129a517153179534895bb7092d29817e7cf1e1 /drivers/infiniband/ulp/ipoib/ipoib_cm.c | |
| parent | 94245f4ad9e10c161affaa4763136d29fbe91cb9 (diff) | |
| download | linux-577e07ffbad9960551a6821b74af90a216ac10e2.tar.xz | |
IB/ipoib: Get rid of IPOIB_FLAG_GOING_DOWN
This essentially duplicates the netdev's reg_state, so just use that
directly. The reg_state is updated under the rntl_lock, and all places
using GOING_DOWN already acquire the rtnl_lock so checking is safe.
Since the only place we use GOING_DOWN is for the parent device this
does not fix any bugs, but it is a step to tidy up the unregister flow
so that after later patches the flow is uniform and sane.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_cm.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 518313a1b0c9..16ea08dc59a8 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -1519,9 +1519,6 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr, int ret; struct ipoib_dev_priv *priv = ipoib_priv(dev); - if (test_bit(IPOIB_FLAG_GOING_DOWN, &priv->flags)) - return -EPERM; - if (!mutex_trylock(&priv->sysfs_mutex)) return restart_syscall(); @@ -1530,6 +1527,12 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr, return restart_syscall(); } + if (dev->reg_state != NETREG_REGISTERED) { + rtnl_unlock(); + mutex_unlock(&priv->sysfs_mutex); + return -EPERM; + } + ret = ipoib_set_mode(dev, buf); /* The assumption is that the function ipoib_set_mode returned |