summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 14:09:18 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 14:09:18 +1000
commita09bda6f27358c5ef4ef601c8ae627573ab93bce (patch)
treeb2fc65680905b496ada8b98260563f339886f0de /include
parent5af0b6bc2296f135dfda7fd49edea02a01157732 (diff)
parent9d4394883505295f4b8428adc74fe8aa0d1d3a5d (diff)
Merge commit 'fsnotify/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/fsnotify_backend.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 6c3de999fb34..ef415139d555 100644
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -58,9 +58,13 @@
FS_MOVED_FROM | FS_MOVED_TO | FS_CREATE |\
FS_DELETE)
+#define FS_MOVE (FS_MOVED_FROM | FS_MOVED_TO)
+
/* listeners that hard code group numbers near the top */
#define DNOTIFY_GROUP_NUM UINT_MAX
-#define INOTIFY_GROUP_NUM (DNOTIFY_GROUP_NUM-1)
+#define AUDIT_WATCH_GROUP_NUM (DNOTIFY_GROUP_NUM-1)
+#define AUDIT_TREE_GROUP_NUM (AUDIT_WATCH_GROUP_NUM-1)
+#define INOTIFY_GROUP_NUM (AUDIT_TREE_GROUP_NUM-1)
struct fsnotify_group;
struct fsnotify_event;
@@ -339,8 +343,10 @@ extern void fsnotify_recalc_inode_mask(struct inode *inode);
extern void fsnotify_init_mark(struct fsnotify_mark_entry *entry, void (*free_mark)(struct fsnotify_mark_entry *entry));
/* find (and take a reference) to a mark associated with group and inode */
extern struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *group, struct inode *inode);
+/* copy the values from old into new */
+extern void fsnotify_duplicate_mark(struct fsnotify_mark_entry *new, struct fsnotify_mark_entry *old);
/* attach the mark to both the group and the inode */
-extern int fsnotify_add_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group, struct inode *inode);
+extern int fsnotify_add_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group, struct inode *inode, int allow_dups);
/* given a mark, flag it to be freed when all references are dropped */
extern void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry);
/* run all the marks in a group, and flag them to be freed */