Commit 07b24141 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] md: Opencode flush_curr_signals in md.c

It is (now) too trivial to even have an inline.
parent 7baaf5dd
...@@ -2473,12 +2473,6 @@ static struct block_device_operations md_fops = ...@@ -2473,12 +2473,6 @@ static struct block_device_operations md_fops =
.ioctl = md_ioctl, .ioctl = md_ioctl,
}; };
static inline void flush_curr_signals(void)
{
flush_signals(current);
}
int md_thread(void * arg) int md_thread(void * arg)
{ {
mdk_thread_t *thread = arg; mdk_thread_t *thread = arg;
...@@ -2525,7 +2519,7 @@ int md_thread(void * arg) ...@@ -2525,7 +2519,7 @@ int md_thread(void * arg)
blk_run_queues(); blk_run_queues();
} }
if (signal_pending(current)) if (signal_pending(current))
flush_curr_signals(); flush_signals(current);
} }
complete(thread->event); complete(thread->event);
return 0; return 0;
...@@ -2945,7 +2939,7 @@ void md_handle_safemode(mddev_t *mddev) ...@@ -2945,7 +2939,7 @@ void md_handle_safemode(mddev_t *mddev)
if (signal_pending(current)) { if (signal_pending(current)) {
printk(KERN_INFO "md: md%d in safe mode\n",mdidx(mddev)); printk(KERN_INFO "md: md%d in safe mode\n",mdidx(mddev));
mddev->safemode= 1; mddev->safemode= 1;
flush_curr_signals(); flush_signals(current);
} }
if (mddev->safemode) if (mddev->safemode)
md_enter_safemode(mddev); md_enter_safemode(mddev);
...@@ -2996,7 +2990,7 @@ static void md_do_sync(void *data) ...@@ -2996,7 +2990,7 @@ static void md_do_sync(void *data)
} }
if (wait_event_interruptible(resync_wait, if (wait_event_interruptible(resync_wait,
mddev2->curr_resync < mddev->curr_resync)) { mddev2->curr_resync < mddev->curr_resync)) {
flush_curr_signals(); flush_signals(current);
err = -EINTR; err = -EINTR;
mddev_put(mddev2); mddev_put(mddev2);
goto skip; goto skip;
...@@ -3079,7 +3073,7 @@ static void md_do_sync(void *data) ...@@ -3079,7 +3073,7 @@ static void md_do_sync(void *data)
* got a signal, exit. * got a signal, exit.
*/ */
printk(KERN_INFO "md: md_do_sync() got signal ... exiting\n"); printk(KERN_INFO "md: md_do_sync() got signal ... exiting\n");
flush_curr_signals(); flush_signals(current);
err = -EINTR; err = -EINTR;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment