diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /fs/sysfs | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index da25aeb0e062..364208071e17 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -96,7 +96,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer | |||
| 96 | /** | 96 | /** |
| 97 | * flush_read_buffer - push buffer to userspace. | 97 | * flush_read_buffer - push buffer to userspace. |
| 98 | * @buffer: data buffer for file. | 98 | * @buffer: data buffer for file. |
| 99 | * @userbuf: user-passed buffer. | 99 | * @buf: user-passed buffer. |
| 100 | * @count: number of bytes requested. | 100 | * @count: number of bytes requested. |
| 101 | * @ppos: file position. | 101 | * @ppos: file position. |
| 102 | * | 102 | * |
| @@ -164,7 +164,7 @@ out: | |||
| 164 | /** | 164 | /** |
| 165 | * fill_write_buffer - copy buffer from userspace. | 165 | * fill_write_buffer - copy buffer from userspace. |
| 166 | * @buffer: data buffer for file. | 166 | * @buffer: data buffer for file. |
| 167 | * @userbuf: data from user. | 167 | * @buf: data from user. |
| 168 | * @count: number of bytes in @userbuf. | 168 | * @count: number of bytes in @userbuf. |
| 169 | * | 169 | * |
| 170 | * Allocate @buffer->page if it hasn't been already, then | 170 | * Allocate @buffer->page if it hasn't been already, then |