epoll: add syscall epoll_pwait2

[linux-2.6-microblaze.git] / fs / nfsd / filecache.c

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 3c6c2f7..53fcbf7 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -600,7 +600,7 @@ static struct notifier_block nfsd_file_lease_notifier = {
 static int
 nfsd_file_fsnotify_handle_event(struct fsnotify_mark *mark, u32 mask,
                                struct inode *inode, struct inode *dir,
-                               const struct qstr *name)
+                               const struct qstr *name, u32 cookie)
 {
        trace_nfsd_file_fsnotify_handle_event(inode, mask);
 
@@ -685,6 +685,7 @@ nfsd_file_cache_init(void)
        if (IS_ERR(nfsd_file_fsnotify_group)) {
                pr_err("nfsd: unable to create fsnotify group: %ld\n",
                        PTR_ERR(nfsd_file_fsnotify_group));
+               ret = PTR_ERR(nfsd_file_fsnotify_group);
                nfsd_file_fsnotify_group = NULL;
                goto out_notifier;
        }