From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D1BB158532 for ; Mon, 19 Aug 2024 09:33:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724060010; cv=none; b=eKsHJ622d3ohzQBA5vhR+lUF/K1WL4RS5SjvSmsIbqjCaEquIKfYn/IlZQHYqAR3YzVZOGEGD6d7Gpg45Y7UoCSEr+2t5RHhjUlAxAancA4+yPR5E2gwNrkB/OPyueHSdxozENZqQF9oSYka5MznTWzKRjFOZzI0PFGMm6gKZCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724060010; c=relaxed/simple; bh=sHGQEB2ZZbtHEL/T443MhSGO+h/jP2/DcON19zv2uSE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=O3PRsokuqyUmBl8VHU09UMj/3SFJF0QUYHFfn49ngZAQ0K4b1GJ0eUDmUjKCnDUzdpsKuhLx7SggTOQ+UnczGJ8NQogBtldtcVimSFdqLzgvjiSj+l1IrlfvGqCD3C3aErCZ5Vi4qtMk+gtgXb5bIP06IO3sRtaKAWFeYrbLcPw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Tc+Dz/Lz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Tc+Dz/Lz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE839C32782; Mon, 19 Aug 2024 09:33:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724060010; bh=sHGQEB2ZZbtHEL/T443MhSGO+h/jP2/DcON19zv2uSE=; h=Subject:To:Cc:From:Date:From; b=Tc+Dz/LzPreixZWgIOogECZLAucwDR4o8+aqvnzIG8quBT9yYGOGxTY6J/XK1PlFW zxY1vUAc6guKqIggafOXwiMjWwXMY7gri3UrtQIUEwIj9f2b/iikovX6rQgsOApHRh YD7ysZtqSoYeGLx9AOAazpIdOjszOurPZYEfTHc8= Subject: FAILED: patch "[PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR" failed to apply to 6.6-stable tree To: mpatocka@redhat.com Cc: From: Date: Mon, 19 Aug 2024 11:33:24 +0200 Message-ID: <2024081924-fidelity-leverage-7546@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 # git commit -s git send-email --to '' --in-reply-to '2024081924-fidelity-leverage-7546@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 1e1fd567d32f ("dm suspend: return -ERESTARTSYS instead of -EINTR") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1e1fd567d32fcf7544c6e09e0e5bc6c650da6e23 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Tue, 13 Aug 2024 12:38:51 +0200 Subject: [PATCH] dm suspend: return -ERESTARTSYS instead of -EINTR This commit changes device mapper, so that it returns -ERESTARTSYS instead of -EINTR when it is interrupted by a signal (so that the ioctl can be restarted). The manpage signal(7) says that the ioctl function should be restarted if the signal was handled with SA_RESTART. Signed-off-by: Mikulas Patocka Cc: stable@vger.kernel.org diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 97fab2087df8..87bb90303435 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta break; if (signal_pending_state(task_state, current)) { - r = -EINTR; + r = -ERESTARTSYS; break; } @@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st break; if (signal_pending_state(task_state, current)) { - r = -EINTR; + r = -ERESTARTSYS; break; }