diff options
author | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /fs/hugetlbfs/inode.c | |
parent | 6470c077cae12227318f40f3e6d756caadcce4b0 (diff) | |
parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) |
Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/hugetlbfs/inode.c')
-rw-r--r-- | fs/hugetlbfs/inode.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index ccc62de96df8..941c8425c10b 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -313,16 +313,6 @@ out: | |||
313 | return retval; | 313 | return retval; |
314 | } | 314 | } |
315 | 315 | ||
316 | /* | ||
317 | * Read a page. Again trivial. If it didn't already exist | ||
318 | * in the page cache, it is zero-filled. | ||
319 | */ | ||
320 | static int hugetlbfs_readpage(struct file *file, struct page * page) | ||
321 | { | ||
322 | unlock_page(page); | ||
323 | return -EINVAL; | ||
324 | } | ||
325 | |||
326 | static int hugetlbfs_write_begin(struct file *file, | 316 | static int hugetlbfs_write_begin(struct file *file, |
327 | struct address_space *mapping, | 317 | struct address_space *mapping, |
328 | loff_t pos, unsigned len, unsigned flags, | 318 | loff_t pos, unsigned len, unsigned flags, |
@@ -702,7 +692,6 @@ static void hugetlbfs_destroy_inode(struct inode *inode) | |||
702 | } | 692 | } |
703 | 693 | ||
704 | static const struct address_space_operations hugetlbfs_aops = { | 694 | static const struct address_space_operations hugetlbfs_aops = { |
705 | .readpage = hugetlbfs_readpage, | ||
706 | .write_begin = hugetlbfs_write_begin, | 695 | .write_begin = hugetlbfs_write_begin, |
707 | .write_end = hugetlbfs_write_end, | 696 | .write_end = hugetlbfs_write_end, |
708 | .set_page_dirty = hugetlbfs_set_page_dirty, | 697 | .set_page_dirty = hugetlbfs_set_page_dirty, |