summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLino Sanfilippo <LinoSanfilippo@gmx.de>2010-10-29 12:06:42 +0200
committerEric Paris <eparis@redhat.com>2010-10-30 14:07:35 -0400
commit1a5cea7215f7c6bd3c960d7b44e864f3a73d1ad4 (patch)
treed8bdd846e5ef83c1707eaf9e9040705d80869260
parentd8c0fca68da25ca3df534dfb12ce628675c828e4 (diff)
downloadop-kernel-dev-1a5cea7215f7c6bd3c960d7b44e864f3a73d1ad4.zip
op-kernel-dev-1a5cea7215f7c6bd3c960d7b44e864f3a73d1ad4.tar.gz
make fanotify_read() restartable across signals
In fanotify_read() return -ERESTARTSYS instead of -EINTR to make read() restartable across signals (BSD semantic). Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--fs/notify/fanotify/fanotify_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index fce66df..0632248 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -330,7 +330,7 @@ static ssize_t fanotify_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;
OpenPOWER on IntegriCloud