diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2014-10-12 22:16:02 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:19 -0500 |
| commit | b5ae6b15bd73e35b129408755a0804287a87e041 (patch) | |
| tree | bc674dfb16177844acf90fed70320dd641fe77cd /include/linux/dcache.h | |
| parent | Merge branch 'for-gfs2' into for-next (diff) | |
| download | linux-dev-b5ae6b15bd73e35b129408755a0804287a87e041.tar.xz linux-dev-b5ae6b15bd73e35b129408755a0804287a87e041.zip | |
merge d_materialise_unique() into d_splice_alias()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/dcache.h')
| -rw-r--r-- | include/linux/dcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 1c2f1b84468b..ee569da27b72 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -230,7 +230,7 @@ extern seqlock_t rename_lock; */ extern void d_instantiate(struct dentry *, struct inode *); extern struct dentry * d_instantiate_unique(struct dentry *, struct inode *); -extern struct dentry * d_materialise_unique(struct dentry *, struct inode *); +#define d_materialise_unique(d, i) d_splice_alias(i, d) extern int d_instantiate_no_diralias(struct dentry *, struct inode *); extern void __d_drop(struct dentry *dentry); extern void d_drop(struct dentry *dentry); |