1 files changed, 4 insertions, 8 deletions

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 4c74c768ae43..0f9c073d78d5 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -2313,19 +2313,17 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
                 size_t, sigsetsize)
 {
         int error;
-        sigset_t ksigmask, sigsaved;
 
         /*
          * If the caller wants a certain signal mask to be set during the wait,
          * we apply it here.
          */
-        error = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        error = set_user_sigmask(sigmask, sigsetsize);
         if (error)
                 return error;
 
         error = do_epoll_wait(epfd, events, maxevents, timeout);
-
-        restore_user_sigmask(sigmask, &sigsaved, error == -EINTR);
+        restore_saved_sigmask_unless(error == -EINTR);
 
         return error;
 }
@@ -2338,19 +2336,17 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd,
                         compat_size_t, sigsetsize)
 {
         long err;
-        sigset_t ksigmask, sigsaved;
 
         /*
          * If the caller wants a certain signal mask to be set during the wait,
          * we apply it here.
          */
-        err = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
+        err = set_compat_user_sigmask(sigmask, sigsetsize);
         if (err)
                 return err;
 
         err = do_epoll_wait(epfd, events, maxevents, timeout);
-
-        restore_user_sigmask(sigmask, &sigsaved, err == -EINTR);
+        restore_saved_sigmask_unless(err == -EINTR);
 
         return err;
 }