From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 726C13E557C for ; Wed, 3 Jun 2026 03:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780456245; cv=none; b=oMIrhHe6kM9yebBVgtDj4HThEuscZCPjiVFX1FP6goup2Rzx+5UrxzoosAMelHLICLZwKt8MgHz0MKSOJIfBtcfJYHnzqYowLMaa6IaqisVXKzdqOkbU4sBYUFuf12c0Y+gq0aNsIk7iC+MOVw8E17f/NPLdsljoVUiOfPmNeUo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780456245; c=relaxed/simple; bh=HVNkOPHRvv2OjTiFyRyfjJ8pj8Jxd14in2nZP9HrCGM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uuqxH6MXm3zV4ogwT6UbGvkjM1wPPH/rYrvvK1PYH2XHrqql6SkHH32mjceSdapq/6KDlgmoG3+lb2oV0nvWLf0TCwgphvSxr+F3X2Zjw/GYgIiAx87rtr6Uumyp6dhuwGPXHAOuBQ7w4ykgERoWwnx8R89pJuu70okjXv6wgAM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=Spm9oXR6; arc=none smtp.client-ip=209.85.160.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="Spm9oXR6" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-51761d27612so22481851cf.3 for ; Tue, 02 Jun 2026 20:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1780456242; x=1781061042; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=AkUPkSV1yVhPwfuKkUdfLaMgLJzqLtKdtBHH9XilSKA=; b=Spm9oXR65xzWaE7H22QQFdPwz0C2KkpSzCOPtbWhbo44tqLfsUjVKSF9+K0RuCqaJ+ NPsll3cF0QrelaMuEvcsaxlDoatXR2w30bA/xyBG+Es14+hoadk7T7+SD/HwO1X/Kh3Y jw3AP6+BM8blpFjMnkdP7WegdyJBMN95AC/M3mu9SnxV/UCxwJFU5QRRGHph6DJmnuhi HWvBJQ7pQsS1gNAoJ6ibmshUMgo5dR9QaCMSXlHQjMcdnRWiSphX07nPscR2hxSJLdcc fgztBz1V8m2Lu6s8bW0cMKXXCiWqC5U42g/ROLl9C51TDHAVlpfPOzNSN0lr5WAC0OiH FUJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780456242; x=1781061042; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AkUPkSV1yVhPwfuKkUdfLaMgLJzqLtKdtBHH9XilSKA=; b=Nt6iHDi7q7LEuTDy3ohuEsI1dwdTW7i6tU5kot53gBg0eQmOoXj9RD65Kh3kRwwKwU SgVYIcdt4t+XA84AQzQIYVKnQFQhTSxrB2sODhD1ScI+4bvLjCU6SsKUOoYjwvGgT/Yv m+Oh3NUhE/25w2X6i81VFwkLyCbULiqm/uobw+QgsSvtxKmh+VgMON8LQb6hDFiW2R3h jF9wEA4zV5n7hm5ql7VOowKdAEsxvlfS6kQ9wj9byXLbalcz7dTzvkF/M50X4Bk7LTX6 FI/oCxkYRgPG4DKfCVR7nyr76K4Fh7FpzsmO2PEY2X8PoeEk5nRopnbpPtqJArpYvX3Q 3RdA== X-Forwarded-Encrypted: i=1; AFNElJ+sA3ka96ub8LjsGIqHg439CEhFWb2uRM+8VCjFUzf6kRLSREOp5a95P/OrKy2i4cntSEkadwZpJz+mMq0=@vger.kernel.org X-Gm-Message-State: AOJu0YxR3v9GLMr6LnjBzL/LPqpvaGCEqvJV0GGvZgSzdGORhG6WHqBN 6/+WMcfIvScvGaxYZ/mzwUFIyg/sMbjP/ntZoMP+qr/UCaG6g+agEd3WZkPmW8uTwf4= X-Gm-Gg: Acq92OFE/nK7t6r5Xjv7WlAOkrquUYRbjYm3C7HRVUwFnvdBzCipB98SEy47h5KwGZq jA25GuAfNJW7oJHu2+oY65O4A7r1muBUY66I/Qlbk5uzHTDCCeGWlfzTZhiO/UFExXiHyDOQ6Fh uuyZhaRTkxZWXwVwLQavo3vddYo0SL0dWKc/yqHW6OTTbGqoA+Kccw9mzWksI2lfMQ0JuxmDSsT 3pHEbmNua8mFrsYTK54NXHUJWDHoO3GbGOD8tC7MtGlYBG4vJUhmZw/EXqZDcSROMF4gQGmxPOK c6p/otgfO3iXxBshdGVNorRaSTijKPIi+u8+82QyrWnFPdPwhwu2Gaqn2CWmwgnP3xglCnyhfzi u5vXV+fxH9cunofgFuCiYpqIHYGzrAVhp99OkqT0CVeeC1oQU2I/ms8BhN09tluS069DoFDfNiK 5y9V/aCNM+G5YUJ/hL7/kvdCPgVokhmNvngyYrUteBxCYXZfrLaJWjzxwuySZxEaKwq/kyJLW2 X-Received: by 2002:a05:622a:2487:b0:516:510f:2dd5 with SMTP id d75a77b69052e-517786c83c7mr29904991cf.28.1780456242538; Tue, 02 Jun 2026 20:10:42 -0700 (PDT) Received: from plex ([71.181.43.54]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51775c07f0dsm14637641cf.3.2026.06.02.20.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:10:42 -0700 (PDT) Date: Wed, 3 Jun 2026 03:10:40 +0000 From: Pasha Tatashin To: Mike Rapoport Cc: Pasha Tatashin , linux-kselftest@vger.kernel.org, shuah@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, skhan@linuxfoundation.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, corbet@lwn.net, dmatlack@google.com, kexec@lists.infradead.org, pratyush@kernel.org, skhawaja@google.com, graf@amazon.com Subject: Re: [PATCH v4 02/13] liveupdate: avoid mixing cleanup guards with goto in luo_session_retrieve_fd Message-ID: References: <20260530221938.115978-1-pasha.tatashin@soleen.com> <20260530221938.115978-3-pasha.tatashin@soleen.com> <178038801485.119771.9514973100282773342.b4-review@b4> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <178038801485.119771.9514973100282773342.b4-review@b4> On 06-02 11:13, Mike Rapoport wrote: > On Sat, 30 May 2026 22:19:27 +0000, Pasha Tatashin 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. >