diff options
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 863b46e0d78a..5f96786d1c73 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
11 | #include <linux/file.h> | 11 | #include <linux/file.h> |
12 | #include <linux/capability.h> | ||
12 | #include <linux/dnotify.h> | 13 | #include <linux/dnotify.h> |
13 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
14 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
@@ -35,7 +36,7 @@ void fastcall set_close_on_exec(unsigned int fd, int flag) | |||
35 | spin_unlock(&files->file_lock); | 36 | spin_unlock(&files->file_lock); |
36 | } | 37 | } |
37 | 38 | ||
38 | static inline int get_close_on_exec(unsigned int fd) | 39 | static int get_close_on_exec(unsigned int fd) |
39 | { | 40 | { |
40 | struct files_struct *files = current->files; | 41 | struct files_struct *files = current->files; |
41 | struct fdtable *fdt; | 42 | struct fdtable *fdt; |
@@ -457,11 +458,11 @@ static void send_sigio_to_task(struct task_struct *p, | |||
457 | else | 458 | else |
458 | si.si_band = band_table[reason - POLL_IN]; | 459 | si.si_band = band_table[reason - POLL_IN]; |
459 | si.si_fd = fd; | 460 | si.si_fd = fd; |
460 | if (!send_group_sig_info(fown->signum, &si, p)) | 461 | if (!group_send_sig_info(fown->signum, &si, p)) |
461 | break; | 462 | break; |
462 | /* fall-through: fall back on the old plain SIGIO signal */ | 463 | /* fall-through: fall back on the old plain SIGIO signal */ |
463 | case 0: | 464 | case 0: |
464 | send_group_sig_info(SIGIO, SEND_SIG_PRIV, p); | 465 | group_send_sig_info(SIGIO, SEND_SIG_PRIV, p); |
465 | } | 466 | } |
466 | } | 467 | } |
467 | 468 | ||
@@ -495,7 +496,7 @@ static void send_sigurg_to_task(struct task_struct *p, | |||
495 | struct fown_struct *fown) | 496 | struct fown_struct *fown) |
496 | { | 497 | { |
497 | if (sigio_perm(p, fown, SIGURG)) | 498 | if (sigio_perm(p, fown, SIGURG)) |
498 | send_group_sig_info(SIGURG, SEND_SIG_PRIV, p); | 499 | group_send_sig_info(SIGURG, SEND_SIG_PRIV, p); |
499 | } | 500 | } |
500 | 501 | ||
501 | int send_sigurg(struct fown_struct *fown) | 502 | int send_sigurg(struct fown_struct *fown) |