---

yaml --- r: 347907 b: refs/heads/master c: 1ca39ab h: refs/heads/master i: 347905: a99326b 347903: a86bb67 v: v3
git-mirror · Dec 11, 2012 · 4d3cb82 · 4d3cb82
1 parent d6dd425
commit 4d3cb82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;