From 4cbf50717efa9a587aeba7a88bcc4cdc8cb04cc2 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 20 Jan 2010 22:27:56 +0200
Subject: [PATCH] --- yaml --- r: 207693 b: refs/heads/master c:
 6e006701ccc1590500186ef21e074bd900c5dd67 h: refs/heads/master i:   207691:
 3b2c3d8acb124ddb911dac3889902df76b5ab786 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/dnotify.h | 1 +
 trunk/include/linux/fs.h      | 3 ---
 trunk/kernel/sysctl.c         | 1 +
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 849947b498bb..3d7c1c149905 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59b0df211bd9699d7e0d01fcf9345a149f75b033
+refs/heads/master: 6e006701ccc1590500186ef21e074bd900c5dd67
diff --git a/trunk/include/linux/dnotify.h b/trunk/include/linux/dnotify.h
index ecc06286226d..3290555a52ee 100644
--- a/trunk/include/linux/dnotify.h
+++ b/trunk/include/linux/dnotify.h
@@ -28,6 +28,7 @@ struct dnotify_struct {
 			    FS_CREATE | FS_DN_RENAME |\
 			    FS_MOVED_FROM | FS_MOVED_TO)
 
+extern int dir_notify_enable;
 extern void dnotify_flush(struct file *, fl_owner_t);
 extern int fcntl_dirnotify(int, struct file *, unsigned long);
 
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index f9a003278758..d92c212476f9 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -410,9 +410,6 @@ extern int get_max_files(void);
 extern int sysctl_nr_open;
 extern struct inodes_stat_t inodes_stat;
 extern int leases_enable, lease_break_time;
-#ifdef CONFIG_DNOTIFY
-extern int dir_notify_enable;
-#endif
 
 struct buffer_head;
 typedef int (get_block_t)(struct inode *inode, sector_t iblock,
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index d24f761f4876..7b983dbfe0ec 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -44,6 +44,7 @@
 #include <linux/times.h>
 #include <linux/limits.h>
 #include <linux/dcache.h>
+#include <linux/dnotify.h>
 #include <linux/syscalls.h>
 #include <linux/vmstat.h>
 #include <linux/nfs_fs.h>