hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB5UKT -------------------------------- The err_put_fd tag is only used once, so remove it to make the code more readable Signed-off-by: Baokun Li <libaokun1@huawei.com> --- fs/cachefiles/ondemand.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index 493b8b8675f7..968376ea9ae6 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -366,7 +366,10 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache, if (copy_to_user(_buffer, msg, n) != 0) { ret = -EFAULT; - goto err_put_fd; + if (msg->opcode == CACHEFILES_OP_OPEN) + __close_fd(current->files, + ((struct cachefiles_open *)msg->data)->fd); + goto error; } /* CLOSE request has no reply */ @@ -378,10 +381,6 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache, } return n; -err_put_fd: - if (msg->opcode == CACHEFILES_OP_OPEN) - __close_fd(current->files, - ((struct cachefiles_open *)msg->data)->fd); error: xa_lock(&cache->reqs); radix_tree_delete(&cache->reqs, id); -- 2.46.1