diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-09-01 17:39:13 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-09-04 19:05:15 -0400 |
| commit | bdd1d2d3d251c65b74ac4493e08db18971c09240 (patch) | |
| tree | 71df247eeb367203c59a26eed8a384398c2d8131 /fs/coda/dir.c | |
| parent | c41fbad015dabb0a40ecca50c3ff5658eb6471ff (diff) | |
| download | linux-stable-bdd1d2d3d251c65b74ac4493e08db18971c09240.tar.gz linux-stable-bdd1d2d3d251c65b74ac4493e08db18971c09240.tar.bz2 linux-stable-bdd1d2d3d251c65b74ac4493e08db18971c09240.zip | |
fs: fix kernel_read prototype
Use proper ssize_t and size_t types for the return value and count
argument, move the offset last and make it an in/out argument like
all other read/write helpers, and make the buf argument a void pointer
to get rid of lots of casts in the callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/coda/dir.c')
| -rw-r--r-- | fs/coda/dir.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index c0474ac6cbf2..274ab5586dd0 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -368,9 +368,10 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx) goto out; while (1) { + loff_t pos = ctx->pos - 2; + /* read entries from the directory file */ - ret = kernel_read(host_file, ctx->pos - 2, (char *)vdir, - sizeof(*vdir)); + ret = kernel_read(host_file, vdir, sizeof(*vdir), &pos); if (ret < 0) { pr_err("%s: read dir %s failed %d\n", __func__, coda_f2s(&cii->c_fid), ret); |