Commit 4006553b authored Jul 23, 2008 by Ulrich Drepper Committed by Linus Torvalds Jul 24, 2008

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>

parent ed8cae8b

arch/x86/ia32/ia32entry.S

+1 −0

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

arch/x86/kernel/syscall_table_32.S

+1 −0

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

fs/inotify_user.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -566,7 +566,7 @@ static const struct inotify_operations inotify_user_ops = {
		.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_handle *ih;
		@@ -574,7 +574,10 @@ asmlinkage long sys_inotify_init(void)
		struct file *filp;
		int fd, ret;

		fd = get_unused_fd();
		if (flags & ~IN_CLOEXEC)
		return -EINVAL;

		fd = get_unused_fd_flags(flags & O_CLOEXEC);
		if (fd < 0)
		return fd;

		@@ -638,6 +641,11 @@ asmlinkage long sys_inotify_init(void)
		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)
		{
		struct inode *inode;

include/asm-x86/unistd_32.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -337,6 +337,7 @@
		#define __NR_epoll_create2 329
		#define __NR_dup3 330
		#define __NR_pipe2 331
		#define __NR_inotify_init1 332

		#ifdef __KERNEL__

include/asm-x86/unistd_64.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -651,6 +651,8 @@ __SYSCALL(__NR_epoll_create2, sys_epoll_create2)
		__SYSCALL(__NR_dup3, sys_dup3)
		#define __NR_pipe2 293
		__SYSCALL(__NR_pipe2, sys_pipe2)
		#define __NR_inotify_init1 294
		__SYSCALL(__NR_inotify_init1, sys_inotify_init1)


		#ifndef __NO_STUBS