kill f_dentry macro

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index b6b55a9cffee91be68ad916c38efc320fced443a..fa2db081505e6d6d581ea4ee6d8f1eaab56a3482 100644 (file)
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -467,3 +467,7 @@ in your dentry operations instead.
 [mandatory]
        d_materialise_unique() is gone; d_splice_alias() does everything you
        need now.  Remember that they have opposite orders of arguments ;-/
+--
+[mandatory]
+       f_dentry is gone; use f_path.dentry, or, better yet, see if you can avoid
+       it entirely.

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1c12c681803feac79366a6fb43e0a60cc6948e49..1a8bb3c023a1df9a3c97bdc25150348db6fc6f73 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -789,7 +789,6 @@ struct file {
                struct rcu_head         fu_rcuhead;
        } f_u;
        struct path             f_path;
-#define f_dentry       f_path.dentry
        struct inode            *f_inode;       /* cached value */
        const struct file_operations    *f_op;