From 10b3bedcb03386cc280113f552479793e4bac35f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 11 Aug 2010 12:41:48 -0700 Subject: [PATCH] Add support for Linux fanotify_init and fanotify_mask syscalls. --- ChangeLog | 9 ++++++ NEWS | 2 +- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/Versions | 2 ++ sysdeps/unix/sysv/linux/i386/syscalls.list | 3 ++ sysdeps/unix/sysv/linux/sys/fanotify.h | 39 +++++++++++++++++++++++ sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 3 ++ 7 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/sys/fanotify.h diff --git a/ChangeLog b/ChangeLog index 30b59e690f..f5a1a622c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2010-08-11 Ulrich Drepper + * sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers): + Add sys/fanotify.h. + * sysdeps/unix/sysv/linux/Versions [libc]: Export fanotify_init and + fanotify_mask for GLIBC_2.13. + * sysdeps/unix/sysv/linux/i386/syscalls.list: Add entries for + fanotify_init and fanotify_mark. + * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Likewise. + * sysdeps/unix/sysv/linux/sys/fanotify.h: New file. + * sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_routines): Add prlimit. * sysdeps/unix/sysv/linux/Versions [libc]: Export prlimit and diff --git a/NEWS b/NEWS index 0e461c23bf..d9cc5e4114 100644 --- a/NEWS +++ b/NEWS @@ -11,7 +11,7 @@ Version 2.13 11640, 11701, 11840, 11856, 11883, 11903 -* New Linux interfaces: prlimit, prlimit64 +* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark * POWER7 optimizations: memset, memcmp, strncmp diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 5ab6a4f1e9..4302bd392c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -30,7 +30,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \ sys/ultrasound.h sys/raw.h sys/personality.h sys/epoll.h \ bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \ - sys/timerfd.h + sys/timerfd.h sys/fanotify.h install-others += $(inst_includedir)/bits/syscall.h diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index c662765751..c66e04fee8 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -151,6 +151,8 @@ libc { } GLIBC_2.13 { prlimit; prlimit64; + + fanotify_init; fanotify_mark; } GLIBC_PRIVATE { # functions used in other libraries diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 597e5989c4..91c70e880a 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -8,3 +8,6 @@ oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid prlimit64 EXTRA prlimit64 i:iipp prlimit64 + +fanotify_init EXTRA fanotify_init i:iii fanotify_init +fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/sys/fanotify.h b/sysdeps/unix/sysv/linux/sys/fanotify.h new file mode 100644 index 0000000000..baf5ec33d1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sys/fanotify.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _SYS_FANOTIFY_H +#define _SYS_FANOTIFY_H 1 + +#include +#include + + +__BEGIN_DECLS + +/* Create and initialize fanotify group. */ +extern int fanotify_init (unsigned int __flags, unsigned int __event_f_flags, + int __priority) __THROW; + +/* Add, remove, or modify an fanotify mark on a filesystem object. */ +extern int fanotify_mark (int __fanotify_fd, unsigned int __flags, + uint64_t __mask, int __dfd, const char *__pathname) + __THROW; + +__END_DECLS + +#endif /* sys/fanotify.h */ diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index b2e21638d0..4276bd68ac 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -18,3 +18,6 @@ sync_file_range - sync_file_range i:iiii sync_file_range creat - creat Ci:si __libc_creat creat creat64 open - open Ci:siv __libc_open __open open __open64 open64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 + +fanotify_init EXTRA fanotify_init i:iii fanotify_init +fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark -- 2.11.4.GIT