Replace manually paired mutex_lock/unlock with scoped_guard to align with the coding style of the rest of the codebase and simplify locking paths. Signed-off-by: Chenghao Duan --- kernel/liveupdate/luo_session.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/liveupdate/luo_session.c b/kernel/liveupdate/luo_session.c index f38b5b18f3f8..06307868a44e 100644 --- a/kernel/liveupdate/luo_session.c +++ b/kernel/liveupdate/luo_session.c @@ -290,9 +290,8 @@ static int luo_session_retrieve_fd(struct luo_session *session, if (argp->fd < 0) return argp->fd; - mutex_lock(&session->mutex); - err = luo_retrieve_file(&session->file_set, argp->token, &file); - mutex_unlock(&session->mutex); + scoped_guard(mutex, &session->mutex) + err = luo_retrieve_file(&session->file_set, argp->token, &file); if (err < 0) goto err_put_fd; @@ -478,9 +477,8 @@ int luo_session_create(const char *name, struct file **filep) if (err) goto err_free; - mutex_lock(&session->mutex); - err = luo_session_getfile(session, filep); - mutex_unlock(&session->mutex); + scoped_guard(mutex, &session->mutex) + err = luo_session_getfile(session, filep); if (err) goto err_remove; up_read(&luo_session_serialize_rwsem); -- 2.25.1