diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-04-18 12:59:16 +0800 |
| commit | 667ea3959654ae48ef303df13f2635fd07766cb4 (patch) | |
| tree | 7f284b5ec16d010773a1101e02b0acb141ae40f4 /fs/afs/dir.c | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
| parent | 6fb17a412207343151aac1fde91935a542339deb (diff) | |
Merge remote-tracking branch 'origin/v3.14/topic/overlayfs' into linux-linaro-lsk-v3.14
Diffstat (limited to 'fs/afs/dir.c')
| -rw-r--r-- | fs/afs/dir.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 529300327f45..5479af6de6ce 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -26,7 +26,7 @@ static int afs_readdir(struct file *file, struct dir_context *ctx); static int afs_d_revalidate(struct dentry *dentry, unsigned int flags); static int afs_d_delete(const struct dentry *dentry); static void afs_d_release(struct dentry *dentry); -static int afs_lookup_filldir(void *_cookie, const char *name, int nlen, +static int afs_lookup_filldir(struct dir_context *ctx, const char *name, int nlen, loff_t fpos, u64 ino, unsigned dtype); static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl); @@ -391,10 +391,11 @@ static int afs_readdir(struct file *file, struct dir_context *ctx) * - if afs_dir_iterate_block() spots this function, it'll pass the FID * uniquifier through dtype */ -static int afs_lookup_filldir(void *_cookie, const char *name, int nlen, - loff_t fpos, u64 ino, unsigned dtype) +static int afs_lookup_filldir(struct dir_context *ctx, const char *name, + int nlen, loff_t fpos, u64 ino, unsigned dtype) { - struct afs_lookup_cookie *cookie = _cookie; + struct afs_lookup_cookie *cookie = + container_of(ctx, struct afs_lookup_cookie, ctx); _enter("{%s,%u},%s,%u,,%llu,%u", cookie->name.name, cookie->name.len, name, nlen, |