Re: [PATCH 3/5] ppoll: use __kernel_timespec

[Arnd Bergmann <arnd@xxxxxxxx>]

On Sat, Sep 1, 2018 at 10:48 PM Deepa Dinamani <deepa.kernel@xxxxxxxxx> wrote:

> +
> +       /* We can restart this syscall, usually */
> +       if (ret == -EINTR) {
> +               restore_user_sigmask(sigmask, &sigsaved);
> +               ret = -ERESTARTNOHAND;
> +       }

I need a little help understanding this part: In the two existing copies of that
function, you have changed it to

        restore_user_sigmask(sigmask, &sigsaved);
        if (ret == -EINTR)
                ret = -ERESTARTNOHAND;

in the previous patch, but the new new copies you add here do

       if (ret == -EINTR) {
               restore_user_sigmask(sigmask, &sigsaved);
               ret = -ERESTARTNOHAND;
       }

Is that intentional, or did you accidently leave a version in here that
you had changed afterwards?

       Arnd