diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 | 
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 | 
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /fs/compat.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/compat.c b/fs/compat.c index 728cd8365384..6b06b6bae35e 100644 --- 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> @@ -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;  }  | 
