Merge branch 'for-next/tftp'

2 files changed, 10 insertions, 1 deletions

diff --git a/fs/fs.c b/fs/fs.c
index c6cb49996e..dda19db913 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1262,6 +1262,15 @@ static void d_invalidate(struct dentry *dentry)
 {
 }
 
+static int d_no_revalidate(struct dentry *dir, unsigned int flags)
+{
+	return 0;
+}
+
+const struct dentry_operations no_revalidate_d_ops = {
+	.d_revalidate = d_no_revalidate,
+};
+
 static inline int d_revalidate(struct dentry *dentry, unsigned int flags)
 {
 	if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE))
diff --git a/fs/tftp.c b/fs/tftp.c
index 43293272d7..1f36c56511 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -29,7 +29,6 @@
 #include <libgen.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <fs.h>
 #include <init.h>
 #include <linux/stat.h>
 #include <linux/err.h>
@@ -716,6 +715,7 @@ static int tftp_probe(struct device_d *dev)
 	}
 
 	sb->s_op = &tftp_ops;
+	sb->s_d_op = &no_revalidate_d_ops;
 
 	inode = tftp_get_inode(sb, NULL, S_IFDIR);
 	sb->s_root = d_make_root(inode);