On 06-02 11:13, Mike Rapoport wrote: > On Sat, 30 May 2026 22:19:27 +0000, Pasha Tatashin > <[email protected]> wrote: > > diff --git a/kernel/liveupdate/luo_session.c > > b/kernel/liveupdate/luo_session.c > > index 146414933977..8d9201c25412 100644 > > --- a/kernel/liveupdate/luo_session.c > > +++ b/kernel/liveupdate/luo_session.c > > @@ -291,25 +291,24 @@ static int luo_session_retrieve_fd(struct luo_session > > *session, > > if (argp->fd < 0) > > return argp->fd; > > > > - guard(mutex)(&session->mutex); > > - err = luo_retrieve_file(&session->file_set, argp->token, &file); > > - if (err < 0) > > - goto err_put_fd; > > + scoped_guard(mutex, &session->mutex) { > > + err = luo_retrieve_file(&session->file_set, argp->token, &file); > > + if (err < 0) { > > + put_unused_fd(argp->fd); > > + return err; > > I don't like piling up error handling inside if (err) statements. > > As we only need the lock only for luo_retrieve_file() I think it's better > drop the guard and use goto: > > > mutex_lock(&session->mutex); > err = luo_retrieve_file(&session->file_set, argp->token, &file); > mutex_unlock(&session->mutex); > if (err) > ...
ok, done. > > -- > Sincerely yours, > Mike. >
