aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2012-03-21 19:34:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 20:54:59 -0400
commita1d776ee3147cec2a54a645e92eb2e3e2f65a137 (patch)
tree244e9a44121be417dc9c999bed2a439b8cb01f8d /include
parentef6942224a185c9e434f6cfe69fe434e732f5b38 (diff)
hugetlb: cleanup hugetlb.h
Make a couple of small cleanups to linux/include/hugetlb.h. The set_file_hugepages() function, which was not used anywhere is removed, and the hugetlbfs_config and hugetlbfs_inode_info structures with its HUGETLBFS_I helper function are moved into inode.c, the only place they were used. These structures are really linked to the hugetlbfs filesystem specifically not to hugepage mm handling in general, so they belong in the filesystem code not in a generally available header. It would be nice to move the hugetlbfs_sb_info (superblock) structure in there as well, but it's currently needed in a number of places via the hstate_vma() and hstate_inode(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Cc: Hugh Dickins <hughd@google.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Andrew Barry <abarry@cray.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Minchan Kim <minchan.kim@gmail.com> Cc: Hillf Danton <dhillf@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hugetlb.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index d9d6c868b86b..7adc4923e7ac 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -128,15 +128,6 @@ enum {
128}; 128};
129 129
130#ifdef CONFIG_HUGETLBFS 130#ifdef CONFIG_HUGETLBFS
131struct hugetlbfs_config {
132 uid_t uid;
133 gid_t gid;
134 umode_t mode;
135 long nr_blocks;
136 long nr_inodes;
137 struct hstate *hstate;
138};
139
140struct hugetlbfs_sb_info { 131struct hugetlbfs_sb_info {
141 long max_blocks; /* blocks allowed */ 132 long max_blocks; /* blocks allowed */
142 long free_blocks; /* blocks free */ 133 long free_blocks; /* blocks free */
@@ -146,17 +137,6 @@ struct hugetlbfs_sb_info {
146 struct hstate *hstate; 137 struct hstate *hstate;
147}; 138};
148 139
149
150struct hugetlbfs_inode_info {
151 struct shared_policy policy;
152 struct inode vfs_inode;
153};
154
155static inline struct hugetlbfs_inode_info *HUGETLBFS_I(struct inode *inode)
156{
157 return container_of(inode, struct hugetlbfs_inode_info, vfs_inode);
158}
159
160static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb) 140static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb)
161{ 141{
162 return sb->s_fs_info; 142 return sb->s_fs_info;
@@ -179,14 +159,9 @@ static inline int is_file_hugepages(struct file *file)
179 return 0; 159 return 0;
180} 160}
181 161
182static inline void set_file_hugepages(struct file *file)
183{
184 file->f_op = &hugetlbfs_file_operations;
185}
186#else /* !CONFIG_HUGETLBFS */ 162#else /* !CONFIG_HUGETLBFS */
187 163
188#define is_file_hugepages(file) 0 164#define is_file_hugepages(file) 0
189#define set_file_hugepages(file) BUG()
190static inline struct file *hugetlb_file_setup(const char *name, size_t size, 165static inline struct file *hugetlb_file_setup(const char *name, size_t size,
191 vm_flags_t acctflag, struct user_struct **user, int creat_flags) 166 vm_flags_t acctflag, struct user_struct **user, int creat_flags)
192{ 167{