aboutsummaryrefslogtreecommitdiffstats
path: root/fs/inotify_user.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-24 00:29:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 13:47:29 -0400
commit510df2dd482496083e1c3b1a8c9b6afd5fa4c7d7 (patch)
treecb6fe277b361e13c100d20db5e3689d0e3abca45 /fs/inotify_user.c
parentbe61a86d7237dd80510615f38ae21d6e1e98660c (diff)
flag parameters: NONBLOCK in inotify_init
This patch adds non-blocking support for inotify_init1. The additional changes needed are minimal. The following test must be adjusted for architectures other than x86 and x86-64 and in case the syscall numbers changed. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #include <fcntl.h> #include <stdio.h> #include <unistd.h> #include <sys/syscall.h> #ifndef __NR_inotify_init1 # ifdef __x86_64__ # define __NR_inotify_init1 294 # elif defined __i386__ # define __NR_inotify_init1 332 # else # error "need __NR_inotify_init1" # endif #endif #define IN_NONBLOCK O_NONBLOCK int main (void) { int fd = syscall (__NR_inotify_init1, 0); if (fd == -1) { puts ("inotify_init1(0) failed"); return 1; } int fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if (fl & O_NONBLOCK) { puts ("inotify_init1(0) set non-blocking mode"); return 1; } close (fd); fd = syscall (__NR_inotify_init1, IN_NONBLOCK); if (fd == -1) { puts ("inotify_init1(IN_NONBLOCK) failed"); return 1; } fl = fcntl (fd, F_GETFL); if (fl == -1) { puts ("fcntl failed"); return 1; } if ((fl & O_NONBLOCK) == 0) { puts ("inotify_init1(IN_NONBLOCK) set non-blocking mode"); return 1; } close (fd); puts ("OK"); return 0; } ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Ulrich Drepper <drepper@redhat.com> Acked-by: Davide Libenzi <davidel@xmailserver.org> Cc: Michael Kerrisk <mtk.manpages@googlemail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/inotify_user.c')
-rw-r--r--fs/inotify_user.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 851005998cd4..dc7e1f619748 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -574,7 +574,7 @@ asmlinkage long sys_inotify_init1(int flags)
574 struct file *filp; 574 struct file *filp;
575 int fd, ret; 575 int fd, ret;
576 576
577 if (flags & ~IN_CLOEXEC) 577 if (flags & ~(IN_CLOEXEC | IN_NONBLOCK))
578 return -EINVAL; 578 return -EINVAL;
579 579
580 fd = get_unused_fd_flags(flags & O_CLOEXEC); 580 fd = get_unused_fd_flags(flags & O_CLOEXEC);
@@ -613,7 +613,7 @@ asmlinkage long sys_inotify_init1(int flags)
613 filp->f_path.dentry = dget(inotify_mnt->mnt_root); 613 filp->f_path.dentry = dget(inotify_mnt->mnt_root);
614 filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping; 614 filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping;
615 filp->f_mode = FMODE_READ; 615 filp->f_mode = FMODE_READ;
616 filp->f_flags = O_RDONLY; 616 filp->f_flags = O_RDONLY | (flags & O_NONBLOCK);
617 filp->private_data = dev; 617 filp->private_data = dev;
618 618
619 INIT_LIST_HEAD(&dev->events); 619 INIT_LIST_HEAD(&dev->events);