From 4d3cb829ab6b4e13c3b85f75136bf01b50cb0031 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Mon, 26 Mar 2012 13:07:59 -0400
Subject: [PATCH] --- yaml --- r: 347907 b: refs/heads/master c:
 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 h: refs/heads/master i:   347905:
 a99326bd4480fb5b78f8117433a3836d2db1fcd6   347903:
 a86bb6729ca889037c7d91505a9a48b432b3eb7a v: v3

---
 [refs]                                 | 2 +-
 trunk/fs/notify/inotify/inotify_user.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;