diff --git a/[refs] b/[refs] index 326ce792c9e5..e4c9e6c4c7d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b99c3ccf735a2294c7842d236caa42e543e2c95 +refs/heads/master: 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c index a6879d169241..463e828f1f31 100644 --- a/trunk/fs/notify/inotify/inotify_user.c +++ b/trunk/fs/notify/inotify/inotify_user.c @@ -264,7 +264,7 @@ static ssize_t inotify_read(struct file *file, char __user *buf, ret = -EAGAIN; if (file->f_flags & O_NONBLOCK) break; - ret = -EINTR; + ret = -ERESTARTSYS; if (signal_pending(current)) break;