filesystem notification: create fs/notify to contain all fs notification
Subsystems (4)
PATCH 1/1 filesystem notification: create fs/notify to contain all fs notification
Creating a generic filesystem notification interface, fsnotify, which will be used by inotify, dnotify, and eventually fanotify is really starting to clutter the fs directory. This patch simply moves inotify and dnotify into fs/notify/inotify and fs/notify/dnotify respectively to make both current fs/ and future notification tidier.
---
fs/Kconfig | 39 -- fs/Makefile | 5 fs/dnotify.c | 194 -------- fs/inotify.c | 913 -------------------------------------- fs/inotify_user.c | 778 -------------------------------- fs/notify/Kconfig | 2 fs/notify/Makefile | 2 fs/notify/dnotify/Kconfig | 10 fs/notify/dnotify/Makefile | 1 fs/notify/dnotify/dnotify.c | 194 ++++++++ fs/notify/inotify/Kconfig | 27 + fs/notify/inotify/Makefile | 2 fs/notify/inotify/inotify.c | 913 ++++++++++++++++++++++++++++++++++++++ fs/notify/inotify/inotify_user.c | 778 ++++++++++++++++++++++++++++++++ 14 files changed, 1931 insertions(+), 1927 deletions(-) delete mode 100644 fs/dnotify.c delete mode 100644 fs/inotify.c delete mode 100644 fs/inotify_user.c create mode 100644 fs/notify/Kconfig create mode 100644 fs/notify/Makefile create mode 100644 fs/notify/dnotify/Kconfig create mode 100644 fs/notify/dnotify/Makefile create mode 100644 fs/notify/dnotify/dnotify.c create mode 100644 fs/notify/inotify/Kconfig create mode 100644 fs/notify/inotify/Makefile create mode 100644 fs/notify/inotify/inotify.c create mode 100644 fs/notify/inotify/inotify_user.c
fs/Kconfig +1 -38
@@ -270,44 +270,7 @@ config OCFS2_COMPAT_JBD endif # BLOCK -config DNOTIFY - bool "Dnotify support" - default y - help - Dnotify is a directory-based per-fd file change notification system - that uses signals to communicate events to user-space. There exist - superior alternatives, but some applications may still rely on - dnotify. - - If unsure, say Y. - -config INOTIFY - bool "Inotify file change notification support" - default y - ---help--- - Say Y here to enable inotify support. Inotify is a file change - notification system and a replacement for dnotify. Inotify fixes - numerous shortcomings in dnotify and introduces several new features - including multiple file events, one-shot support, and unmount - notification. - - For more information, see <file:Documentation/filesystems/inotify.txt> - - If unsure, say Y. - -config INOTIFY_USER - bool "Inotify support for userspace" - depends on INOTIFY - default y - ---help--- - Say Y here to enable inotify support for userspace, including the - associated system calls. Inotify allows monitoring of both files and - directories via a single open fd. Events are read from the file - descriptor, which is also select()- and poll()-able. - - For more information, see <file:Documentation/filesystems/inotify.txt> - - If unsure, say Y. +source "fs/notify/Kconfig" config QUOTA bool "Quota support"
fs/Makefile +1 -4
@@ -20,8 +20,7 @@ obj-y += no-block.o endif obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o -obj-$(CONFIG_INOTIFY) += inotify.o -obj-$(CONFIG_INOTIFY_USER) += inotify_user.o +obj-y += notify/ obj-$(CONFIG_EPOLL) += eventpoll.o obj-$(CONFIG_ANON_INODES) += anon_inodes.o obj-$(CONFIG_SIGNALFD) += signalfd.o
@@ -57,8 +56,6 @@ obj-$(CONFIG_QFMT_V1) += quota_v1.o obj-$(CONFIG_QFMT_V2) += quota_v2.o obj-$(CONFIG_QUOTACTL) += quota.o -obj-$(CONFIG_DNOTIFY) += dnotify.o - obj-$(CONFIG_PROC_FS) += proc/ obj-y += partitions/ obj-$(CONFIG_SYSFS) += sysfs/
fs/dnotify.c deleted +0 -194
194 lines not on this page · raw message
fs/inotify.c deleted +0 -913
913 lines not on this page · raw message
fs/inotify_user.c deleted +0 -778
778 lines not on this page · raw message
fs/notify/Kconfig new file +2 -0
@@ -0,0 +1,2 @@ +source "fs/notify/dnotify/Kconfig" +source "fs/notify/inotify/Kconfig"
fs/notify/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +obj-y += dnotify/ +obj-y += inotify/
fs/notify/dnotify/Kconfig new file +10 -0
@@ -0,0 +1,10 @@ +config DNOTIFY + bool "Dnotify support" + default y + help + Dnotify is a directory-based per-fd file change notification system + that uses signals to communicate events to user-space. There exist + superior alternatives, but some applications may still rely on + dnotify. + + If unsure, say Y.
fs/notify/dnotify/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_DNOTIFY) += dnotify.o
fs/notify/dnotify/dnotify.c new file +194 -0
194 lines not on this page · raw message
fs/notify/inotify/Kconfig new file +27 -0
@@ -0,0 +1,27 @@ +config INOTIFY + bool "Inotify file change notification support" + default y + ---help--- + Say Y here to enable inotify support. Inotify is a file change + notification system and a replacement for dnotify. Inotify fixes + numerous shortcomings in dnotify and introduces several new features + including multiple file events, one-shot support, and unmount + notification. + + For more information, see <file:Documentation/filesystems/inotify.txt> + + If unsure, say Y. + +config INOTIFY_USER + bool "Inotify support for userspace" + depends on INOTIFY + default y + ---help--- + Say Y here to enable inotify support for userspace, including the + associated system calls. Inotify allows monitoring of both files and + directories via a single open fd. Events are read from the file + descriptor, which is also select()- and poll()-able. + + For more information, see <file:Documentation/filesystems/inotify.txt> + + If unsure, say Y.
fs/notify/inotify/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +obj-$(CONFIG_INOTIFY) += inotify.o +obj-$(CONFIG_INOTIFY_USER) += inotify_user.o
fs/notify/inotify/inotify.c new file +913 -0
815 lines not on this page · raw message
fs/notify/inotify/inotify_user.c new file +778 -0
778 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 7 lines · Eric Paris
Creating a generic filesystem notification interface, fsnotify, which will be used by inotify, dnotify, and eventually fanotify is really starting to clutter the fs directory. This patch simply moves inotify and dnotify into
fs/notify/inotifyandfs/notify/dnotifyrespectively to make both currentfs/and future notification tidier.Signed-off-by Eric Paris <[email protected]>
For those of you who prefer a more readable diff (aka git format-patch -M), its the exact same patch as here:
Quoted 6 lines · On Wed, 17 Dec 2008 13:59:41 -0500 Eric Paris <[email protected]> wrote:
Creating a generic filesystem notification interface, fsnotify, which will be used by inotify, dnotify, and eventually fanotify is really starting to clutter the fs directory. This patch simply moves inotify and dnotify into
fs/notify/inotifyandfs/notify/dnotifyrespectively to make both currentfs/and future notification tidier.
I have no objections.
Quoted 17 lines
---
fs/Kconfig | 39 -- fs/Makefile | 5 fs/dnotify.c | 194 -------- fs/inotify.c | 913 -------------------------------------- fs/inotify_user.c | 778 -------------------------------- fs/notify/Kconfig | 2 fs/notify/Makefile | 2 fs/notify/dnotify/Kconfig | 10 fs/notify/dnotify/Makefile | 1 fs/notify/dnotify/dnotify.c | 194 ++++++++ fs/notify/inotify/Kconfig | 27 + fs/notify/inotify/Makefile | 2 fs/notify/inotify/inotify.c | 913 ++++++++++++++++++++++++++++++++++++++ fs/notify/inotify/inotify_user.c | 778 ++++++++++++++++++++++++++++++++ 14 files changed, 1931 insertions(+), 1927 deletions(-)
But I don't want to carry the patch in -mm - I'm not well set up for large file movement patches and they're a pita to carry.
git does a good job of this and perhaps we can persuade Al to carry this patch in the vfs tree. Otherwise I'd suggest that you send it in to Linus lateish in the 2.6.29-rc1 merge window. Please remember to cc me on that email.
Al Viro
maintainerQuoted 2 lines · Andrew Morton
git does a good job of this and perhaps we can persuade Al to carry this patch in the vfs tree.
In queue, actually...
Al, very much hoping to finish that crap by the weekend.
Hi Eric.
Quoted 5 lines · Eric Paris
Creating a generic filesystem notification interface, fsnotify, which will be used by inotify, dnotify, and eventually fanotify is really starting to clutter the fs directory. This patch simply moves inotify and dnotify into
fs/notify/inotifyandfs/notify/dnotifyrespectively to make both currentfs/and future notification tidier.
Looks good, but what with the another patches in the series?
Signature · 1 line
Evgeniy Polyakov
[Dropping [email protected] and [email protected] since their e-mails were wrong in MAINTAINERS. I sent them both requests to fix it.]
Quoted 2 lines · Evgeniy Polyakov
Looks good, but what with the another patches in the series?
This can stand pretty well on its own and I figure if it gets into 2.6.29 everyone will at least be patching files on the right path. I'm hoping to have the complete inotify, dnotify, audit, and even fanotify out and hopefully ready for 2.6.30.
Since this is reasonably useful today and I know others are looking at inotify I figured I'd get it in as soon as possible so when I do try to push all my crap that'll be the only conflict, not this moving of files...
-Eric