Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 67c0b94d11485fc4a0449aeb2d911636567daeea..6b06b6bae35e52cd078efaaabe19198007a4b36d 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -37,7 +37,7 @@
 #include <linux/ctype.h>
 #include <linux/module.h>
 #include <linux/dirent.h>
-#include <linux/dnotify.h>
+#include <linux/fsnotify.h>
 #include <linux/highuid.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
@@ -809,7 +809,7 @@ static void *do_smb_super_data_conv(void *raw_data)
 
 struct compat_nfs_string {
        compat_uint_t len;
-       compat_uptr_t __user data;
+       compat_uptr_t data;
 };
 
 static inline void compat_nfs_string(struct nfs_string *dst,
@@ -834,10 +834,10 @@ struct compat_nfs4_mount_data_v1 {
        struct compat_nfs_string mnt_path;
        struct compat_nfs_string hostname;
        compat_uint_t host_addrlen;
-       compat_uptr_t __user host_addr;
+       compat_uptr_t host_addr;
        compat_int_t proto;
        compat_int_t auth_flavourlen;
-       compat_uptr_t __user auth_flavours;
+       compat_uptr_t auth_flavours;
 };
 
 static int do_nfs4_super_data_conv(void *raw_data)
@@ -1307,9 +1307,13 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
 out:
        if (iov != iovstack)
                kfree(iov);
-       if ((ret + (type == READ)) > 0)
-               dnotify_parent(file->f_dentry,
-                               (type == READ) ? DN_ACCESS : DN_MODIFY);
+       if ((ret + (type == READ)) > 0) {
+               struct dentry *dentry = file->f_dentry;
+               if (type == READ)
+                       fsnotify_access(dentry);
+               else
+                       fsnotify_modify(dentry);
+       }
        return ret;
 }