zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()

commit 6980d29ce4da223ad7f0751c7f1d61d3c6b54ab3 upstream.

In zonefs_open_zone(), if opened zone count is larger than
.s_max_open_zones threshold, we missed to recover .i_wr_refcnt,
fix this.

Fixes: b5c00e9757 ("zonefs: open/close zone on file open/close")
Cc: <stable@vger.kernel.org>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chao Yu 2021-03-16 20:30:26 +08:00 committed by Greg Kroah-Hartman
parent 9c1c5e81a0
commit 78486cf1f3

View File

@ -1032,9 +1032,7 @@ static int zonefs_open_zone(struct inode *inode)
mutex_lock(&zi->i_truncate_mutex); mutex_lock(&zi->i_truncate_mutex);
zi->i_wr_refcnt++; if (!zi->i_wr_refcnt) {
if (zi->i_wr_refcnt == 1) {
if (atomic_inc_return(&sbi->s_open_zones) > sbi->s_max_open_zones) { if (atomic_inc_return(&sbi->s_open_zones) > sbi->s_max_open_zones) {
atomic_dec(&sbi->s_open_zones); atomic_dec(&sbi->s_open_zones);
ret = -EBUSY; ret = -EBUSY;
@ -1044,7 +1042,6 @@ static int zonefs_open_zone(struct inode *inode)
if (i_size_read(inode) < zi->i_max_size) { if (i_size_read(inode) < zi->i_max_size) {
ret = zonefs_zone_mgmt(inode, REQ_OP_ZONE_OPEN); ret = zonefs_zone_mgmt(inode, REQ_OP_ZONE_OPEN);
if (ret) { if (ret) {
zi->i_wr_refcnt--;
atomic_dec(&sbi->s_open_zones); atomic_dec(&sbi->s_open_zones);
goto unlock; goto unlock;
} }
@ -1052,6 +1049,8 @@ static int zonefs_open_zone(struct inode *inode)
} }
} }
zi->i_wr_refcnt++;
unlock: unlock:
mutex_unlock(&zi->i_truncate_mutex); mutex_unlock(&zi->i_truncate_mutex);