diff --git a/[refs] b/[refs] index 84327aa18052..b8b20f2f0775 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8860f060e473dce1a0873d92105d536f72b05908 +refs/heads/master: 98b5c10d320adfa250c1c18f3ccaec2f78e5e11d diff --git a/trunk/fs/notify/fsnotify.c b/trunk/fs/notify/fsnotify.c index 668268627894..9810babb1a3b 100644 --- a/trunk/fs/notify/fsnotify.c +++ b/trunk/fs/notify/fsnotify.c @@ -269,7 +269,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, if (event) fsnotify_put_event(event); - return 0; + return ret; } EXPORT_SYMBOL_GPL(fsnotify);