Merge tag 'for-linus-20161104' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / fs / stat.c

diff --git a/fs/stat.c b/fs/stat.c
index d4a61d8dc021e6e70a3a1317ef793753de8165ed..bc045c7994e1bf6fe98af3a475afaeb4ecd8f16a 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -219,7 +219,7 @@ SYSCALL_DEFINE2(fstat, unsigned int, fd, struct __old_kernel_stat __user *, stat
 #  define choose_32_64(a,b) b
 #endif
 
-#define valid_dev(x)  choose_32_64(old_valid_dev,new_valid_dev)(x)
+#define valid_dev(x)  choose_32_64(old_valid_dev(x),true)
 #define encode_dev(x) choose_32_64(old_encode_dev,new_encode_dev)(x)
 
 #ifndef INIT_STRUCT_STAT_PADDING