diff options
Diffstat (limited to 'fs/read_write.c')
-rw-r--r-- | fs/read_write.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 9292f5fa4d62..563abd09b5c8 100644 --- a/fs/read_write.c +++ b/fs/read_write.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/file.h> | 10 | #include <linux/file.h> |
11 | #include <linux/uio.h> | 11 | #include <linux/uio.h> |
12 | #include <linux/smp_lock.h> | 12 | #include <linux/smp_lock.h> |
13 | #include <linux/dnotify.h> | 13 | #include <linux/fsnotify.h> |
14 | #include <linux/security.h> | 14 | #include <linux/security.h> |
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/syscalls.h> | 16 | #include <linux/syscalls.h> |
@@ -252,7 +252,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) | |||
252 | else | 252 | else |
253 | ret = do_sync_read(file, buf, count, pos); | 253 | ret = do_sync_read(file, buf, count, pos); |
254 | if (ret > 0) { | 254 | if (ret > 0) { |
255 | dnotify_parent(file->f_dentry, DN_ACCESS); | 255 | fsnotify_access(file->f_dentry); |
256 | current->rchar += ret; | 256 | current->rchar += ret; |
257 | } | 257 | } |
258 | current->syscr++; | 258 | current->syscr++; |
@@ -303,7 +303,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ | |||
303 | else | 303 | else |
304 | ret = do_sync_write(file, buf, count, pos); | 304 | ret = do_sync_write(file, buf, count, pos); |
305 | if (ret > 0) { | 305 | if (ret > 0) { |
306 | dnotify_parent(file->f_dentry, DN_MODIFY); | 306 | fsnotify_modify(file->f_dentry); |
307 | current->wchar += ret; | 307 | current->wchar += ret; |
308 | } | 308 | } |
309 | current->syscw++; | 309 | current->syscw++; |
@@ -539,9 +539,12 @@ static ssize_t do_readv_writev(int type, struct file *file, | |||
539 | out: | 539 | out: |
540 | if (iov != iovstack) | 540 | if (iov != iovstack) |
541 | kfree(iov); | 541 | kfree(iov); |
542 | if ((ret + (type == READ)) > 0) | 542 | if ((ret + (type == READ)) > 0) { |
543 | dnotify_parent(file->f_dentry, | 543 | if (type == READ) |
544 | (type == READ) ? DN_ACCESS : DN_MODIFY); | 544 | fsnotify_access(file->f_dentry); |
545 | else | ||
546 | fsnotify_modify(file->f_dentry); | ||
547 | } | ||
545 | return ret; | 548 | return ret; |
546 | Efault: | 549 | Efault: |
547 | ret = -EFAULT; | 550 | ret = -EFAULT; |