dm suspend: return -ERESTARTSYS instead of -EINTR

Mikulas Patocka · Mikulas Patocka · commit 1e1fd567d32f · 2024-08-13T13:50:45.000+02:00
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 &lt;mpatocka@redhat.com&gt;
Cc: stable@vger.kernel.org
diff --git 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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -2737,7 +2737,7 @@ static int dm_wait_for_bios_completion(struct mapped_device *md, unsigned int ta`
`2737`	`2737`	`break;`
`2738`	`2738`
`2739`	`2739`	`if (signal_pending_state(task_state, current)) {`
`2740`		`- r = -EINTR;`
	`2740`	`+ r = -ERESTARTSYS;`
`2741`	`2741`	`break;`
`2742`	`2742`	`}`
`2743`	`2743`
`@@ -2762,7 +2762,7 @@ static int dm_wait_for_completion(struct mapped_device *md, unsigned int task_st`
`2762`	`2762`	`break;`
`2763`	`2763`
`2764`	`2764`	`if (signal_pending_state(task_state, current)) {`
`2765`		`- r = -EINTR;`
	`2765`	`+ r = -ERESTARTSYS;`
`2766`	`2766`	`break;`
`2767`	`2767`	`}`
`2768`	`2768`