diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 07:29:44 -0700 |
| commit | 194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch) | |
| tree | 86d926b7407c33379dd719fad2ccaf03d5c5228a /include/linux/dcache.h | |
| parent | c0ff9019ee64101fda8f19338da799fda8217e14 (diff) | |
| parent | 33688abb2802ff3a230bd2441f765477b94cc89e (diff) | |
| download | lwn-194c8581eb9b6d42e9232c7693d86d2ee3799986.tar.gz lwn-194c8581eb9b6d42e9232c7693d86d2ee3799986.zip | |
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/dcache.h')
| -rw-r--r-- | include/linux/dcache.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 484c8792da82..f28100f6b556 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -575,5 +575,17 @@ static inline struct inode *vfs_select_inode(struct dentry *dentry, return inode; } +/** + * d_real_inode - Return the real inode + * @dentry: The dentry to query + * + * If dentry is on an union/overlay, then return the underlying, real inode. + * Otherwise return d_inode(). + */ +static inline struct inode *d_real_inode(struct dentry *dentry) +{ + return d_backing_inode(d_real(dentry)); +} + #endif /* __LINUX_DCACHE_H */ |