diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/devpts/inode.c | 3 | ||||
-rw-r--r-- | fs/hugetlbfs/inode.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 75efb028974b..d5f8c96964be 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
@@ -18,14 +18,13 @@ | |||
18 | #include <linux/mount.h> | 18 | #include <linux/mount.h> |
19 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
21 | #include <linux/magic.h> | ||
21 | #include <linux/idr.h> | 22 | #include <linux/idr.h> |
22 | #include <linux/devpts_fs.h> | 23 | #include <linux/devpts_fs.h> |
23 | #include <linux/parser.h> | 24 | #include <linux/parser.h> |
24 | #include <linux/fsnotify.h> | 25 | #include <linux/fsnotify.h> |
25 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
26 | 27 | ||
27 | #define DEVPTS_SUPER_MAGIC 0x1cd1 | ||
28 | |||
29 | #define DEVPTS_DEFAULT_MODE 0600 | 28 | #define DEVPTS_DEFAULT_MODE 0600 |
30 | /* | 29 | /* |
31 | * ptmx is a new node in /dev/pts and will be unused in legacy (single- | 30 | * ptmx is a new node in /dev/pts and will be unused in legacy (single- |
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 06b7c2623f99..eba6d552d9c9 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -31,12 +31,10 @@ | |||
31 | #include <linux/statfs.h> | 31 | #include <linux/statfs.h> |
32 | #include <linux/security.h> | 32 | #include <linux/security.h> |
33 | #include <linux/ima.h> | 33 | #include <linux/ima.h> |
34 | #include <linux/magic.h> | ||
34 | 35 | ||
35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
36 | 37 | ||
37 | /* some random number */ | ||
38 | #define HUGETLBFS_MAGIC 0x958458f6 | ||
39 | |||
40 | static const struct super_operations hugetlbfs_ops; | 38 | static const struct super_operations hugetlbfs_ops; |
41 | static const struct address_space_operations hugetlbfs_aops; | 39 | static const struct address_space_operations hugetlbfs_aops; |
42 | const struct file_operations hugetlbfs_file_operations; | 40 | const struct file_operations hugetlbfs_file_operations; |