diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-21 01:48:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-21 01:48:31 +0200 |
| commit | 457f82bac659745f6d5052e4c493d92d62722c9c (patch) | |
| tree | b188adcd36db2a3e0c1ccc5d84d19cc3d6c380bd /fs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | 9p: Fix incorrect parameters to v9fs_file_readn. (diff) | |
| download | linux-457f82bac659745f6d5052e4c493d92d62722c9c.tar.xz linux-457f82bac659745f6d5052e4c493d92d62722c9c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: Fix incorrect parameters to v9fs_file_readn.
9p: Possible regression in p9_client_stat
9p: default 9p transport module fix
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/9p/vfs_addr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 6fcb1e7095cf..92828281a30b 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -57,7 +57,7 @@ static int v9fs_vfs_readpage(struct file *filp, struct page *page) buffer = kmap(page); offset = page_offset(page); - retval = v9fs_file_readn(filp, buffer, NULL, offset, PAGE_CACHE_SIZE); + retval = v9fs_file_readn(filp, buffer, NULL, PAGE_CACHE_SIZE, offset); if (retval < 0) goto done; |