diff options
Diffstat (limited to 'fs/sysfs/file.c')
-rw-r--r-- | fs/sysfs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index baa663e6938..ade9a7e6a75 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/kobject.h> | 14 | #include <linux/kobject.h> |
15 | #include <linux/kallsyms.h> | 15 | #include <linux/kallsyms.h> |
16 | #include <linux/slab.h> | ||
16 | #include <linux/namei.h> | 17 | #include <linux/namei.h> |
17 | #include <linux/poll.h> | 18 | #include <linux/poll.h> |
18 | #include <linux/list.h> | 19 | #include <linux/list.h> |
@@ -128,7 +129,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
128 | ssize_t retval = 0; | 129 | ssize_t retval = 0; |
129 | 130 | ||
130 | mutex_lock(&buffer->mutex); | 131 | mutex_lock(&buffer->mutex); |
131 | if (buffer->needs_read_fill) { | 132 | if (buffer->needs_read_fill || *ppos == 0) { |
132 | retval = fill_read_buffer(file->f_path.dentry,buffer); | 133 | retval = fill_read_buffer(file->f_path.dentry,buffer); |
133 | if (retval) | 134 | if (retval) |
134 | goto out; | 135 | goto out; |
@@ -409,8 +410,7 @@ static int sysfs_release(struct inode *inode, struct file *filp) | |||
409 | * return POLLERR|POLLPRI, and select will return the fd whether | 410 | * return POLLERR|POLLPRI, and select will return the fd whether |
410 | * it is waiting for read, write, or exceptions. | 411 | * it is waiting for read, write, or exceptions. |
411 | * Once poll/select indicates that the value has changed, you | 412 | * Once poll/select indicates that the value has changed, you |
412 | * need to close and re-open the file, as simply seeking and reading | 413 | * need to close and re-open the file, or seek to 0 and read again. |
413 | * again will not get new data, or reset the state of 'poll'. | ||
414 | * Reminder: this only works for attributes which actively support | 414 | * Reminder: this only works for attributes which actively support |
415 | * it, and it is not possible to test an attribute from userspace | 415 | * it, and it is not possible to test an attribute from userspace |
416 | * to see if it supports poll (Neither 'poll' nor 'select' return | 416 | * to see if it supports poll (Neither 'poll' nor 'select' return |