flag parameters: inotify_init

This patch introduces the new syscall inotify_init1 (note: the 1 stands for
the one parameter the syscall takes, as opposed to no parameter before).  The
values accepted for this parameter are function-specific and defined in the
inotify.h header.  Here the values must match the O_* flags, though.  In this
patch CLOEXEC support is introduced.

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_CLOEXEC O_CLOEXEC

int
main (void)
{
  int fd;
  fd = syscall (__NR_inotify_init1, 0);
  if (fd == -1)
    {
      puts ("inotify_init1(0) failed");
      return 1;
    }
  int coe = fcntl (fd, F_GETFD);
  if (coe == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if (coe & FD_CLOEXEC)
    {
      puts ("inotify_init1(0) set close-on-exit");
      return 1;
    }
  close (fd);

  fd = syscall (__NR_inotify_init1, IN_CLOEXEC);
  if (fd == -1)
    {
      puts ("inotify_init1(IN_CLOEXEC) failed");
      return 1;
    }
  coe = fcntl (fd, F_GETFD);
  if (coe == -1)
    {
      puts ("fcntl failed");
      return 1;
    }
  if ((coe & FD_CLOEXEC) == 0)
    {
      puts ("inotify_init1(O_CLOEXEC) does not set close-on-exit");
      return 1;
    }
  close (fd);

  puts ("OK");

  return 0;
}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[akpm@linux-foundation.org: add sys_ni stub]
Signed-off-by: Ulrich Drepper <drepper@redhat.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ulrich Drepper 2008-07-23 21:29:32 -07:00 committed by Linus Torvalds
parent ed8cae8ba0
commit 4006553b06
8 changed files with 22 additions and 2 deletions

View file

@ -831,4 +831,5 @@ ia32_sys_call_table:
.quad sys_epoll_create2 .quad sys_epoll_create2
.quad sys_dup3 /* 330 */ .quad sys_dup3 /* 330 */
.quad sys_pipe2 .quad sys_pipe2
.quad sys_inotify_init1
ia32_syscall_end: ia32_syscall_end:

View file

@ -331,3 +331,4 @@ ENTRY(sys_call_table)
.long sys_epoll_create2 .long sys_epoll_create2
.long sys_dup3 /* 330 */ .long sys_dup3 /* 330 */
.long sys_pipe2 .long sys_pipe2
.long sys_inotify_init1

View file

@ -566,7 +566,7 @@ static const struct inotify_operations inotify_user_ops = {
.destroy_watch = free_inotify_user_watch, .destroy_watch = free_inotify_user_watch,
}; };
asmlinkage long sys_inotify_init(void) asmlinkage long sys_inotify_init1(int flags)
{ {
struct inotify_device *dev; struct inotify_device *dev;
struct inotify_handle *ih; struct inotify_handle *ih;
@ -574,7 +574,10 @@ asmlinkage long sys_inotify_init(void)
struct file *filp; struct file *filp;
int fd, ret; int fd, ret;
fd = get_unused_fd(); if (flags & ~IN_CLOEXEC)
return -EINVAL;
fd = get_unused_fd_flags(flags & O_CLOEXEC);
if (fd < 0) if (fd < 0)
return fd; return fd;
@ -638,6 +641,11 @@ out_put_fd:
return ret; return ret;
} }
asmlinkage long sys_inotify_init(void)
{
return sys_inotify_init1(0);
}
asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
{ {
struct inode *inode; struct inode *inode;

View file

@ -337,6 +337,7 @@
#define __NR_epoll_create2 329 #define __NR_epoll_create2 329
#define __NR_dup3 330 #define __NR_dup3 330
#define __NR_pipe2 331 #define __NR_pipe2 331
#define __NR_inotify_init1 332
#ifdef __KERNEL__ #ifdef __KERNEL__

View file

@ -651,6 +651,8 @@ __SYSCALL(__NR_epoll_create2, sys_epoll_create2)
__SYSCALL(__NR_dup3, sys_dup3) __SYSCALL(__NR_dup3, sys_dup3)
#define __NR_pipe2 293 #define __NR_pipe2 293
__SYSCALL(__NR_pipe2, sys_pipe2) __SYSCALL(__NR_pipe2, sys_pipe2)
#define __NR_inotify_init1 294
__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
#ifndef __NO_STUBS #ifndef __NO_STUBS

View file

@ -7,6 +7,8 @@
#ifndef _LINUX_INOTIFY_H #ifndef _LINUX_INOTIFY_H
#define _LINUX_INOTIFY_H #define _LINUX_INOTIFY_H
/* For O_CLOEXEC */
#include <linux/fcntl.h>
#include <linux/types.h> #include <linux/types.h>
/* /*
@ -63,6 +65,9 @@ struct inotify_event {
IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \ IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \
IN_MOVE_SELF) IN_MOVE_SELF)
/* Flags for sys_inotify_init1. */
#define IN_CLOEXEC O_CLOEXEC
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/dcache.h> #include <linux/dcache.h>

View file

@ -547,6 +547,7 @@ asmlinkage long sys_get_mempolicy(int __user *policy,
unsigned long addr, unsigned long flags); unsigned long addr, unsigned long flags);
asmlinkage long sys_inotify_init(void); asmlinkage long sys_inotify_init(void);
asmlinkage long sys_inotify_init1(int flags);
asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, asmlinkage long sys_inotify_add_watch(int fd, const char __user *path,
u32 mask); u32 mask);
asmlinkage long sys_inotify_rm_watch(int fd, u32 wd); asmlinkage long sys_inotify_rm_watch(int fd, u32 wd);

View file

@ -96,6 +96,7 @@ cond_syscall(sys_keyctl);
cond_syscall(compat_sys_keyctl); cond_syscall(compat_sys_keyctl);
cond_syscall(compat_sys_socketcall); cond_syscall(compat_sys_socketcall);
cond_syscall(sys_inotify_init); cond_syscall(sys_inotify_init);
cond_syscall(sys_inotify_init1);
cond_syscall(sys_inotify_add_watch); cond_syscall(sys_inotify_add_watch);
cond_syscall(sys_inotify_rm_watch); cond_syscall(sys_inotify_rm_watch);
cond_syscall(sys_migrate_pages); cond_syscall(sys_migrate_pages);