projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gpmc-omap-fixes-for-v4.7' of https://github.com/rogerq/linux into fixes
[cascardo/linux.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
8754e9a
..
be6e48b
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-936,6
+936,8
@@
static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
}
dirent = buf->previous;
if (dirent) {
}
dirent = buf->previous;
if (dirent) {
+ if (signal_pending(current))
+ return -EINTR;
if (__put_user(offset, &dirent->d_off))
goto efault;
}
if (__put_user(offset, &dirent->d_off))
goto efault;
}
@@
-1020,6
+1022,8
@@
static int compat_filldir64(struct dir_context *ctx, const char *name,
dirent = buf->previous;
if (dirent) {
dirent = buf->previous;
if (dirent) {
+ if (signal_pending(current))
+ return -EINTR;
if (__put_user_unaligned(offset, &dirent->d_off))
goto efault;
}
if (__put_user_unaligned(offset, &dirent->d_off))
goto efault;
}