Filesystem Events Connector v4
PATCH 1/1 Filesystem Events Connector v4
This release is v4, compared with v3, it adds and improve some functions:
* The user can set event filter in order to just get those events who concerns, filter may be based on event mask, pid, uid and gid.
* it removes the atomic_t variable cn_fs_listener and adopt a smart way to decide whether it should send a event.
* Add several filter operation commands and acknowleges , add a new struct fsevent_filter as command struct.
basically, these functions enable it to meet the user's requirements better,
but, it can't do better because of connector broadcast property, I plan to use netlink to let different user see different events, filter is based on userspace appplication using it, every application can set its own filters and see different events.
drivers/connector/Kconfig | 12 + drivers/connector/Makefile | 1 drivers/connector/cn_fs.c | 298 +++++++++++++++++++++++++++++++++++++++++ drivers/connector/connector.c | 4 fs/namespace.c | 12 + include/linux/connector.h | 8 - include/linux/fsevent.h | 122 +++++++++++++++++ include/linux/fsnotify.h | 37 +++++ 8 files changed, 490 insertions(+), 4 deletions(-)
include/linux/connector.h renamed from include/linux/connector.h.orig +7 -1
@@ -35,7 +35,13 @@#define CN_IDX_CIFS 0x2#define CN_VAL_CIFS 0x1 -#define CN_NETLINK_USERS 1 +/* +* Filesystem Events Connector unique ids -- used for message routing +*/ +#define CN_IDX_FS 0x3 +#define CN_VAL_FS 0x1 + +#define CN_NETLINK_USERS 3/* * Maximum connector's message size.
include/linux/fsnotify.h renamed from include/linux/fsnotify.h.orig +37 -0
@@ -15,6 +15,7 @@#include <linux/dnotify.h> #include <linux/inotify.h> +#include <linux/fsevent.h> /* * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir
@@ -45,6 +46,8 @@ static inline void fsnotify_move(structif (source) {inotify_inode_queue_event (source,IN_MOVE_SELF ,0 ,NULL ); } +raise_fsevent_move (old_dir, old_name, new_dir, new_name, +FSEVENT_MOVE | (isdir?FSEVENT_ISDIR :0 )); }/*
@@ -56,6 +59,8 @@ static inline void fsnotify_nameremove(s isdir =IN_ISDIR ;dnotify_parent (dentry,DN_DELETE );inotify_dentry_parent_queue_event (dentry,IN_DELETE |isdir,0 , dentry->d_name.name); +raise_fsevent (dentry, +FSEVENT_DELETE | (isdir?FSEVENT_ISDIR :0 )); }/*
@@ -74,6 +79,7 @@ static inline void fsnotify_create(struc {inode_dir_notify (inode,DN_CREATE );inotify_inode_queue_event (inode,IN_CREATE ,0 , name); +raise_fsevent_create (inode, name,FSEVENT_CREATE ); }/*
@@ -83,6 +89,8 @@ static inline void fsnotify_mkdir(struct {inode_dir_notify (inode,DN_CREATE );inotify_inode_queue_event (inode,IN_CREATE |IN_ISDIR ,0 , name); +raise_fsevent_create (inode, name, +FSEVENT_CREATE |FSEVENT_ISDIR ); }/*
@@ -99,6 +107,8 @@ static inline void fsnotify_access(strucdnotify_parent (dentry,DN_ACCESS );inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name);inotify_inode_queue_event (inode, mask,0 ,NULL ); +raise_fsevent (dentry,FSEVENT_ACCESS | + ((S_ISDIR (inode->i_mode))?FSEVENT_ISDIR :0 )); }/*
@@ -115,6 +125,8 @@ static inline void fsnotify_modify(strucdnotify_parent (dentry,DN_MODIFY );inotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name);inotify_inode_queue_event (inode, mask,0 ,NULL ); +raise_fsevent (dentry,FSEVENT_MODIFY | + ((S_ISDIR (inode->i_mode))?FSEVENT_ISDIR :0 )); }/*
@@ -130,6 +142,9 @@ static inline void fsnotify_open(structinotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name);inotify_inode_queue_event (inode, mask,0 ,NULL ); +raise_fsevent (dentry,FSEVENT_OPEN | + ((S_ISDIR (inode->i_mode))?FSEVENT_ISDIR :0 )); + }/*
@@ -148,6 +163,8 @@ static inline void fsnotify_close(structinotify_dentry_parent_queue_event (dentry, mask,0 , name);inotify_inode_queue_event (inode, mask,0 ,NULL ); +raise_fsevent (dentry,FSEVENT_CLOSE | + ((S_ISDIR (inode->i_mode))?FSEVENT_ISDIR :0 )); }/*
@@ -163,6 +180,8 @@ static inline void fsnotify_xattr(structinotify_dentry_parent_queue_event (dentry, mask,0 , dentry->d_name.name);inotify_inode_queue_event (inode, mask,0 ,NULL ); +raise_fsevent (dentry,FSEVENT_MODIFY_ATTRIB | + ((S_ISDIR (inode->i_mode))?FSEVENT_ISDIR :0 )); }/*
@@ -213,6 +232,24 @@ static inline void fsnotify_change(strucinotify_dentry_parent_queue_event (dentry, in_mask,0 , dentry->d_name.name); } + +#ifdef CONFIG_FS_EVENTS + { +u32 fsevent_mask =0 ; +if (ia_valid & (ATTR_UID |ATTR_GID |ATTR_MODE )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +if ((ia_valid &ATTR_ATIME ) && (ia_valid &ATTR_MTIME )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +else if (ia_valid &ATTR_ATIME ) + fsevent_mask |=FSEVENT_ACCESS ; +else if (ia_valid &ATTR_MTIME ) + fsevent_mask |=FSEVENT_MODIFY ; +if (ia_valid &ATTR_SIZE ) + fsevent_mask |=FSEVENT_MODIFY ; +if (fsevent_mask) +raise_fsevent (dentry, fsevent_mask); + } +#endif /* CONFIG_FS_EVENTS */ }#ifdef CONFIG_INOTIFY /* inotify helpers */
fs/namespace.c renamed from fs/namespace.c.orig +12 -0
@@ -25,6 +25,7 @@#include <linux/mount.h> #include <asm/uaccess.h> #include <asm/unistd.h> +#include <linux/fsevent.h> #include "pnode.h" extern int __init init_rootfs (void );
@@ -612,6 +613,13 @@ asmlinkage long sys_umount(char __user * goto dput_and_out; retval =do_umount (nd.mnt, flags); + +if (retval ==0 ) { +char * tmp =getname (name); +raise_fsevent_umount (tmp); +putname (tmp); + } + dput_and_out:path_release_on_umount (&nd); out:
@@ -1459,6 +1467,10 @@ asmlinkage long sys_mount(char __user * retval =do_mount ((char *)dev_page, dir_page, (char *)type_page, flags, (void *)data_page);unlock_kernel (); + +if (retval ==0 ) +raise_fsevent_mount ((char *)dev_page, dir_page); +free_page (data_page); out3:
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +1 -3
@@ -111,9 +111,7 @@ int cn_netlink_send(struct cn_msg *msg,NETLINK_CB (skb).dst_group = group; -netlink_broadcast (dev->nls, skb,0 , group, gfp_mask); - -return 0 ; +return (netlink_broadcast (dev->nls, skb,0 , group, gfp_mask)); nlmsg_failure:kfree_skb (skb);
drivers/connector/Kconfig renamed from drivers/connector/Kconfig.orig +12 -0
@@ -18,4 +18,16 @@ config PROC_EVENTS Provide a connector that reports process events to userspace. Send events such as fork, exec, id change (uid, gid, suid, etc), and exit. +config FS_EVENTS + boolean "Report filesystem events to userspace" + depends on CONNECTOR=y + default y + ---help--- + Provide a connector that reports filesystem events to userspace. The + reported event include access, write, utime, chmod, chown, chgrp, + close, open, create, rename, unlink, mkdir, rmdir, mount, umount. + + The user can set filesystem events filter to filter its events, so + that he just get those events he concerns. + endmenu
drivers/connector/Makefile renamed from drivers/connector/Makefile.orig +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_CONNECTOR) += cn.o obj-$(CONFIG_PROC_EVENTS) += cn_proc.o +obj-$(CONFIG_FS_EVENTS) += cn_fs.o cn-y += cn_queue.o connector.o
include/linux/fsevent.h new file +122 -0
122 lines not on this page · raw message
drivers/connector/cn_fs.c new file +298 -0
298 lines not on this page · raw message
Quoted 37 lines · Yi Yang
This release is v4, compared with v3, it adds and improve some functions:
* The user can set event filter in order to just get those events who concerns, filter may be based on event mask, pid, uid and gid.
* it removes theatomic_tvariablecn_fs_listenerand adopt a smart way to decide whether it should send a event.
* Add several filter operation commands and acknowleges , add a new structfsevent_filteras command struct.basically, these functions enable it to meet the user's requirements better,
but, it can't do better because of connector broadcast property, I plan to use netlink to let different user see different events, filter is based on userspace appplication using it, every application can set its own filters and see different events.drivers/connector/Kconfig | 12 + drivers/connector/Makefile | 1 drivers/connector/cn_fs.c | 298 +++++++++++++++++++++++++++++++++++++++++ drivers/connector/connector.c | 4 fs/namespace.c | 12 + include/linux/connector.h | 8 - include/linux/fsevent.h | 122 +++++++++++++++++ include/linux/fsnotify.h | 37 +++++ 8 files changed, 490 insertions(+), 4 deletions(-)Signed-off-by Yi Yang <[email protected]>include/linux/fsnotify.h renamed from include/linux/fsnotify.h.orig +9
-0+ +#ifdef CONFIG_FS_EVENTS + { +u32 fsevent_mask =0 ; +if (ia_valid & (ATTR_UID |ATTR_GID |ATTR_MODE )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +if ((ia_valid &ATTR_ATIME ) && (ia_valid &ATTR_MTIME )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +else if (ia_valid &ATTR_ATIME )
include/linux/fsnotify.h static inline void fsnotify_change(struc · line 253
Quoted 10 lines
include/linux/fsnotify.h renamed from include/linux/fsnotify.h.orig +9
-0+ fsevent_mask |=FSEVENT_ACCESS ; + else if (ia_valid & ATTR_MTIME) + fsevent_mask |= FSEVENT_MODIFY; +if (ia_valid &ATTR_SIZE ) + fsevent_mask |=FSEVENT_MODIFY ; +if (fsevent_mask) + raise_fsevent(dentry, fsevent_mask); + } +#endif /* CONFIG_FS_EVENTS */ }
Coding style?
drivers/connector/connector.c int cn_netlink_send(struct cn_msg *msg, · line 117
Quoted 13 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +1
-3@@ -111,9 +111,7 @@ int cn_netlink_send(struct cn_msg *msg,NETLINK_CB (skb).dst_group = group; -netlink_broadcast (dev->nls, skb,0 , group, gfp_mask); - -return 0 ; +return (netlink_broadcast (dev->nls, skb,0 , group, gfp_mask)); nlmsg_failure:kfree_skb (skb);
This error value is propageted back in current connector code already.
drivers/connector/connector.c
Quoted 5 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +5
-0+ +/* The following definitions are commands for event filter +* , in acknowlege event for the corresponding command, it +* will set to type field of struct fsevent. +*/
Not an eye-candy.
Quoted 15 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +15
-0+FSEVENT_FILTER_ALL =0x08000000 ,/* For all events */ +FSEVENT_FILTER_PID =0x10000000 ,/* For some process ID */ +FSEVENT_FILTER_UID =0x20000000 ,/* For some user ID */ +FSEVENT_FILTER_GID =0x40000000 ,/* For some group ID */ + +FSEVENT_ISDIR =0x80000000 /* It is set for a dir */ +}; + +#define FSEVENT_MASK 0x800003ff + +typedef unsigned long fsevent_mask_t ; + +struct fsevent_filter { +/* filter type, it just is one or bit-or of them +* FSEVENT_FILTER_ALL
drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+* FSEVENT_FILTER_PID +* FSEVENT_FILTER_UID +* FSEVENT_FILTER_GID +*/ +enum fsevent_type type;/* filter type */ + +/* mask of file system events the user listen or ignore +* if the user need to ignore all the events of some pid +* , gid or uid, he(she) must set mask to FSEVENT_MASK. +*/
"," on the new line.
Quoted 9 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +9
-0+static void turn_off_fsevents (void ) +{ +write_lock (&fsevents_lock); + fsevents_mask =0 ; + fsevents_pid_mask =0 ; + filter_pid =-1 ; + fsevents_uid_mask =0 ; + filter_uid =-1 ; + fsevents_gid_mask =0 ;
drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+ filter_gid =-1 ; +write_unlock (&fsevents_lock); +} + +static int filter_fsevents (u32 * mask) +{ +int ret =0 ; + + (*mask) &=FSEVENT_MASK ; +read_lock (&fsevents_lock);
You do want to use RCU locking here.
It is fast path and it is not allowed to get global smp-unfriendly read lock.
Quoted 29 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +29
-0+if (current->pid == filter_pid) { + (*mask) &= fsevents_pid_mask; +if ((*mask) ==0 ) { + ret =-2 ; + } + goto release_lock; + } + +if (current->uid == filter_uid) { + (*mask) &= fsevents_uid_mask; +if ((*mask) ==0 ) { + ret =-3 ; + } + goto release_lock; + } + +if (current->gid == filter_gid) { + (*mask) &= fsevents_gid_mask; +if ((*mask) ==0 ) { + ret =-4 ; + } + goto release_lock; + } + +if ((((*mask) &FSEVENT_ISDIR ) ==FSEVENT_ISDIR ) + & ((fsevents_mask &FSEVENT_ISDIR ) ==0 )) { + ret =-1 ; + goto release_lock; + }
drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+ + (*mask) &= fsevents_mask; +if ((*mask) ==0 ) { + ret =-5 ; + } + +release_lock: +read_unlock (&fsevents_lock); +return ret; +}
Can it be somehow turned off or moved into per-cpu variables? It is a lot of smp-unfriendly access of global variables.
It of course costs much less than allocations and copies, but no global lock at least.
drivers/connector/connector.c
Quoted 5 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +5
-0+if (newname) { + event->new_fname_len =strlen (newname); +append_string (&nameptr, newname, event->new_fname_len); + event->len += event->new_fname_len +1 ; + }
A space from nowhere.
drivers/connector/connector.c
Quoted 3 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +3
-0+if (ret == -ESRCH ) { +turn_off_fsevents (); + }
Coding style.
drivers/connector/connector.c
Quoted 6 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +6
-0+void raise_fsevent (struct dentry * dentryp,u32 mask) +{ +if (dentryp->d_inode && (MAJOR (dentryp->d_inode->i_rdev) ==4 )) +return ; +__raise_fsevent (dentryp->d_name.name,NULL , mask); +}
Yep, tty can mess the things.
Maybe remove all special devices at all?
drivers/connector/connector.c
Quoted 7 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +7
-0+EXPORT_SYMBOL_GPL (raise_fsevent); + +void raise_fsevent_create (struct inode * inode,const char * name,u32 mask) +{ +read_lock (&fsevents_lock); +__raise_fsevent (name,NULL , mask); +}
Lost read_lock here - you will grab it in
__raise_fsevent()->filter_fsevents().
drivers/connector/connector.c
Quoted 13 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +13
-0+static int __init cn_fs_init (void ) +{ +int err; + +if ((err =cn_add_callback (&cn_fs_event_id,"cn_fs" , + &cn_fsevent_filter_ctl))) { +printk (KERN_WARNING "cn_fs failed to register\n" ); +return err; + } +return 0 ; +} + +module_init (cn_fs_init);
Add module_exit() too.
Main issue is locking in this patchset - it is not allowed to have such
a global lock in those pathes, moving this to RCU is the way to go and definitely not a problem to implement.
Thank you.
Signature · 1 line
Evgeniy Polyakov
Quoted 68 lines · Evgeniy Polyakov
Quoted 40 lines · Yi Yang
This release is v4, compared with v3, it adds and improve some functions:
* The user can set event filter in order to just get those events who concerns, filter may be based on event mask, pid, uid and gid.
* it removes theatomic_tvariablecn_fs_listenerand adopt a smart way to decide whether it should send a event.
* Add several filter operation commands and acknowleges , add a new structfsevent_filteras command struct.basically, these functions enable it to meet the user's requirements better,
but, it can't do better because of connector broadcast property, I plan to use netlink to let different user see different events, filter is based on userspace appplication using it, every application can set its own filters and see different events.drivers/connector/Kconfig | 12 + drivers/connector/Makefile | 1 drivers/connector/cn_fs.c | 298 +++++++++++++++++++++++++++++++++++++++++ drivers/connector/connector.c | 4 fs/namespace.c | 12 + include/linux/connector.h | 8 - include/linux/fsevent.h | 122 +++++++++++++++++ include/linux/fsnotify.h | 37 +++++ 8 files changed, 490 insertions(+), 4 deletions(-)Signed-off-by Yi Yang <[email protected]>include/linux/fsnotify.h renamed from include/linux/fsnotify.h.orig +9
-0+ +#ifdef CONFIG_FS_EVENTS + { +u32 fsevent_mask =0 ; +if (ia_valid & (ATTR_UID |ATTR_GID |ATTR_MODE )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +if ((ia_valid &ATTR_ATIME ) && (ia_valid &ATTR_MTIME )) + fsevent_mask |=FSEVENT_MODIFY_ATTRIB ; +else if (ia_valid &ATTR_ATIME )include/linux/fsnotify.h static inline void fsnotify_change(struc · line 253
Quoted 10 lines
include/linux/fsnotify.h renamed from include/linux/fsnotify.h.orig +9
-0+ fsevent_mask |=FSEVENT_ACCESS ; + else if (ia_valid & ATTR_MTIME) + fsevent_mask |= FSEVENT_MODIFY; +if (ia_valid &ATTR_SIZE ) + fsevent_mask |=FSEVENT_MODIFY ; +if (fsevent_mask) + raise_fsevent(dentry, fsevent_mask); + } +#endif /* CONFIG_FS_EVENTS */ }Coding style?
Quoted 11 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +1
-3@@ -111,9 +111,7 @@ int cn_netlink_send(struct cn_msg *msg,NETLINK_CB (skb).dst_group = group; -netlink_broadcast (dev->nls, skb,0 , group, gfp_mask); - -return 0 ; +return (netlink_broadcast (dev->nls, skb,0 , group, gfp_mask));
Quoted 6 lines
drivers/connector/connector.c int cn_netlink_send(struct cn_msg *msg, · line 117
Quoted 3 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +0
-0nlmsg_failure:kfree_skb (skb);This error value is propageted back in current connector code already.
Which version of kernel do you mean? for 2.6.16, it doesn't return netlink_broadcast's return value.
Quoted 57 lines
drivers/connector/connector.c
Quoted 7 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +5
-0+ +/* The following definitions are commands for event filter +* , in acknowlege event for the corresponding command, it +* will set to type field of struct fsevent. +*/ Not an eye-candy.
Quoted 16 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +15
-0+FSEVENT_FILTER_ALL =0x08000000 ,/* For all events */ +FSEVENT_FILTER_PID =0x10000000 ,/* For some process ID */ +FSEVENT_FILTER_UID =0x20000000 ,/* For some user ID */ +FSEVENT_FILTER_GID =0x40000000 ,/* For some group ID */ + +FSEVENT_ISDIR =0x80000000 /* It is set for a dir */ +}; + +#define FSEVENT_MASK 0x800003ff + +typedef unsigned long fsevent_mask_t ; + +struct fsevent_filter { +/* filter type, it just is one or bit-or of them +* FSEVENT_FILTER_ALL drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+* FSEVENT_FILTER_PID +* FSEVENT_FILTER_UID +* FSEVENT_FILTER_GID +*/ +enum fsevent_type type;/* filter type */ + +/* mask of file system events the user listen or ignore +* if the user need to ignore all the events of some pid +* , gid or uid, he(she) must set mask to FSEVENT_MASK. +*/ "," on the new line.
Quoted 16 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +16
-0+static void turn_off_fsevents (void ) +{ +write_lock (&fsevents_lock); + fsevents_mask =0 ; + fsevents_pid_mask =0 ; + filter_pid =-1 ; + fsevents_uid_mask =0 ; + filter_uid =-1 ; + fsevents_gid_mask =0 ; + filter_gid =-1 ; +write_unlock (&fsevents_lock); +} + +static int filter_fsevents (u32 * mask) +{ +int ret =0 ;
Quoted 10 lines
drivers/connector/connector.c
Quoted 4 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +3
-0+ + (*mask) &=FSEVENT_MASK ; +read_lock (&fsevents_lock);You do want to use RCU locking here.
It is fast path and it is not allowed to get global smp-unfriendly read lock.
You are very right, I'll convert to RCU lock.
Quoted 44 lines
Quoted 30 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +29
-0+if (current->pid == filter_pid) { + (*mask) &= fsevents_pid_mask; +if ((*mask) ==0 ) { + ret =-2 ; + } + goto release_lock; + } + +if (current->uid == filter_uid) { + (*mask) &= fsevents_uid_mask; +if ((*mask) ==0 ) { + ret =-3 ; + } + goto release_lock; + } + +if (current->gid == filter_gid) { + (*mask) &= fsevents_gid_mask; +if ((*mask) ==0 ) { + ret =-4 ; + } + goto release_lock; + } + +if ((((*mask) &FSEVENT_ISDIR ) ==FSEVENT_ISDIR ) + & ((fsevents_mask &FSEVENT_ISDIR ) ==0 )) { + ret =-1 ; + goto release_lock; + }drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+ + (*mask) &= fsevents_mask; +if ((*mask) ==0 ) { + ret =-5 ; + } + +release_lock: +read_unlock (&fsevents_lock); +return ret; +}Can it be somehow turned off or moved into per-cpu variables? It is a lot of smp-unfriendly access of global variables.
Quoted 3 lines
It of course costs much less than allocations and copies, but no global lock at least.
I'll plan to just move them to specific process so that they are only for this process, so lock can be removed completely.
Quoted 62 lines
drivers/connector/connector.c
Quoted 7 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +5
-0+if (newname) { + event->new_fname_len =strlen (newname); +append_string (&nameptr, newname, event->new_fname_len); + event->len += event->new_fname_len +1 ; + }A space from nowhere.
drivers/connector/connector.c
Quoted 4 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +3
-0+if (ret == -ESRCH ) { +turn_off_fsevents (); + }Coding style.
drivers/connector/connector.c
Quoted 7 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +6
-0+void raise_fsevent (struct dentry * dentryp,u32 mask) +{ +if (dentryp->d_inode && (MAJOR (dentryp->d_inode->i_rdev) ==4 )) +return ; +__raise_fsevent (dentryp->d_name.name,NULL , mask); +}Yep, tty can mess the things.
Maybe remove all special devices at all?drivers/connector/connector.c
Quoted 8 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +7
-0+EXPORT_SYMBOL_GPL (raise_fsevent); + +void raise_fsevent_create (struct inode * inode,const char * name,u32 mask) +{ +read_lock (&fsevents_lock); +__raise_fsevent (name,NULL , mask); +}Lost
read_lockhere - you will grab it in
__raise_fsevent()->filter_fsevents().Quoted 4 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +3
-0+static int __init cn_fs_init (void ) +{ +int err;drivers/connector/connector.c
Quoted 10 lines
drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +10
-0+ +if ((err =cn_add_callback (&cn_fs_event_id,"cn_fs" , + &cn_fsevent_filter_ctl))) { +printk (KERN_WARNING "cn_fs failed to register\n" ); +return err; + } +return 0 ; +} + +module_init (cn_fs_init);Add
module_exit()too.
Quoted 6 lines
Main issue is locking in this patchset - it is not allowed to have such
a global lock in those pathes, moving this to RCU is the way to go and definitely not a problem to implement.Thank you.
Thank for your careful review very much, I'll commit a new version to fix your concerns, thanks again.
Quoted 14 lines · Yi Yang
Quoted 12 lines · Evgeniy Polyakov
Quoted 12 lines
--- a/drivers/connector/connector.c.orig 2006-03-27
21:35:15.000000000 +0800
+++b/drivers/connector/connector.c2006-03-27 21:35:53.000000000 +0800drivers/connector/connector.c renamed from drivers/connector/connector.c.orig +1
-3@@ -111,9 +111,7 @@ int cn_netlink_send(struct cn_msg *msg,NETLINK_CB (skb).dst_group = group; -netlink_broadcast (dev->nls, skb,0 , group, gfp_mask); - -return 0 ; +return (netlink_broadcast (dev->nls, skb,0 , group, gfp_mask));
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
nlmsg_failure:kfree_skb(skb);This error value is propageted back in current connector code already.
Which version of kernel do you mean? for 2.6.16, it doesn't return netlink_broadcast's return value.
It was committeed in 2.6.17 timeframe. b191ba0d599928372be5a89f75486eb58efab48a commit id.
It also includes new netlink_has_listeners() call usage, which allows to check in advance if there are listeners or not for given netlink group. netlink_has_listeners() can return false positives, which will be caught by netlink_broadcast().
Signature · 1 line
Evgeniy Polyakov