diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/configfs/file.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/configfs/file.c')
| -rw-r--r-- | fs/configfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 397cb503a180..2b6cb23dd14e 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c | |||
| @@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp | |||
| 115 | goto out; | 115 | goto out; |
| 116 | } | 116 | } |
| 117 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", | 117 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", |
| 118 | __FUNCTION__, count, *ppos, buffer->page); | 118 | __func__, count, *ppos, buffer->page); |
| 119 | retval = simple_read_from_buffer(buf, count, ppos, buffer->page, | 119 | retval = simple_read_from_buffer(buf, count, ppos, buffer->page, |
| 120 | buffer->count); | 120 | buffer->count); |
| 121 | out: | 121 | out: |