Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 304991a80e23099c8f556e80b1ee9f0968fee474..70e61b58baaf662d15f4ca67f355b5dcf8d52438 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1241,6 +1241,16 @@ static inline struct inode *file_inode(const struct file *f)
        return f->f_inode;
 }
 
+static inline struct dentry *file_dentry(const struct file *file)
+{
+       struct dentry *dentry = file->f_path.dentry;
+
+       if (unlikely(dentry->d_flags & DCACHE_OP_REAL))
+               return dentry->d_op->d_real(dentry, file_inode(file));
+       else
+               return dentry;
+}
+
 static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)
 {
        return locks_lock_inode_wait(file_inode(filp), fl);