diff options
Diffstat (limited to 'amarok/src/inotify/inotify.h')
-rw-r--r-- | amarok/src/inotify/inotify.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/amarok/src/inotify/inotify.h b/amarok/src/inotify/inotify.h index 267c88b5..17dcd1e5 100644 --- a/amarok/src/inotify/inotify.h +++ b/amarok/src/inotify/inotify.h @@ -17,7 +17,7 @@ */ struct inotify_event { __s32 wd; /* watch descriptor */ - __u32 mask; /* watch mask */ + __u32 tqmask; /* watch tqmask */ __u32 cookie; /* cookie to synchronize two events */ __u32 len; /* length (including nulls) of name */ char name[0]; /* stub for possible name */ @@ -39,7 +39,7 @@ struct inotify_event { /* the following are legal events. they are sent as needed to any watch */ #define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */ -#define IN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */ +#define IN_TQ_OVERFLOW 0x00004000 /* Event queued overflowed */ #define IN_IGNORED 0x00008000 /* File was ignored */ /* helper events */ @@ -49,7 +49,7 @@ struct inotify_event { /* special flags */ #define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */ #define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */ -#define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ +#define IN_MASK_ADD 0x20000000 /* add to the tqmask of an already existing watch */ #define IN_ISDIR 0x40000000 /* event occurred against dir */ #define IN_ONESHOT 0x80000000 /* only send event once */ @@ -73,7 +73,7 @@ struct inotify_event { extern void inotify_inode_queue_event(struct inode *, __u32, __u32, const char *); -extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32, +extern void inotify_dentry_tqparent_queue_event(struct dentry *, __u32, __u32, const char *); extern void inotify_unmount_inodes(struct list_head *); extern void inotify_inode_is_dead(struct inode *); @@ -82,13 +82,13 @@ extern u32 inotify_get_cookie(void); #else static inline void inotify_inode_queue_event(struct inode *inode, - __u32 mask, __u32 cookie, + __u32 tqmask, __u32 cookie, const char *filename) { } -static inline void inotify_dentry_parent_queue_event(struct dentry *dentry, - __u32 mask, __u32 cookie, +static inline void inotify_dentry_tqparent_queue_event(struct dentry *dentry, + __u32 tqmask, __u32 cookie, const char *filename) { } |