diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-17 00:34:52 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-17 00:34:52 +0300 |
| commit | 9763f7a4a5f7b1a7c480fa06d01b2bad25163c0a (patch) | |
| tree | 63e3f777b699ec26761eab948c40d70bba1476b0 /fs/autofs4/autofs_i.h | |
| parent | 3c55d6bcfe8163ff2b5636b4aabe3caa3f5d95f4 (diff) | |
| parent | 1c4344a50d702307185cb98fb67bff938cd66aa0 (diff) | |
| download | linux-9763f7a4a5f7b1a7c480fa06d01b2bad25163c0a.tar.xz | |
Merge branch 'work.autofs' into for-linus
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/autofs_i.h')
| -rw-r--r-- | fs/autofs4/autofs_i.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index a1fba4285277..c885daae68c8 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -145,7 +145,7 @@ void autofs4_free_ino(struct autofs_info *); /* Expiration */ int is_autofs4_dentry(struct dentry *); -int autofs4_expire_wait(struct dentry *dentry, int rcu_walk); +int autofs4_expire_wait(const struct path *path, int rcu_walk); int autofs4_expire_run(struct super_block *, struct vfsmount *, struct autofs_sb_info *, struct autofs_packet_expire __user *); @@ -217,7 +217,8 @@ static inline int autofs_prepare_pipe(struct file *pipe) /* Queue management functions */ -int autofs4_wait(struct autofs_sb_info *, struct dentry *, enum autofs_notify); +int autofs4_wait(struct autofs_sb_info *, + const struct path *, enum autofs_notify); int autofs4_wait_release(struct autofs_sb_info *, autofs_wqt_t, int); void autofs4_catatonic_mode(struct autofs_sb_info *); |