Commit 9045d47ea362e6a3727ee3f1b69a1b656976772e
1 parent
fe61f1d737
Exists in
master
and in
7 other branches
Revert "xen/privcmd: create address space to allow writable mmaps"
This reverts commit 24a89b5be4cf2b7f1b49b56b6cb4a7b71fccf241. We should no longer need an address space now that we're correctly setting VM_PFNMAP on our vmas. Conflicts: drivers/xen/xenfs/super.c Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Showing 1 changed file with 4 additions and 36 deletions Side-by-side Diff
drivers/xen/xenfs/super.c
| ... | ... | @@ -12,8 +12,6 @@ |
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <linux/fs.h> |
| 14 | 14 | #include <linux/magic.h> |
| 15 | -#include <linux/mm.h> | |
| 16 | -#include <linux/backing-dev.h> | |
| 17 | 15 | |
| 18 | 16 | #include <xen/xen.h> |
| 19 | 17 | |
| 20 | 18 | |
| ... | ... | @@ -24,28 +22,12 @@ |
| 24 | 22 | MODULE_DESCRIPTION("Xen filesystem"); |
| 25 | 23 | MODULE_LICENSE("GPL"); |
| 26 | 24 | |
| 27 | -static int xenfs_set_page_dirty(struct page *page) | |
| 28 | -{ | |
| 29 | - return !TestSetPageDirty(page); | |
| 30 | -} | |
| 31 | - | |
| 32 | -static const struct address_space_operations xenfs_aops = { | |
| 33 | - .set_page_dirty = xenfs_set_page_dirty, | |
| 34 | -}; | |
| 35 | - | |
| 36 | -static struct backing_dev_info xenfs_backing_dev_info = { | |
| 37 | - .ra_pages = 0, /* No readahead */ | |
| 38 | - .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, | |
| 39 | -}; | |
| 40 | - | |
| 41 | 25 | static struct inode *xenfs_make_inode(struct super_block *sb, int mode) |
| 42 | 26 | { |
| 43 | 27 | struct inode *ret = new_inode(sb); |
| 44 | 28 | |
| 45 | 29 | if (ret) { |
| 46 | 30 | ret->i_mode = mode; |
| 47 | - ret->i_mapping->a_ops = &xenfs_aops; | |
| 48 | - ret->i_mapping->backing_dev_info = &xenfs_backing_dev_info; | |
| 49 | 31 | ret->i_uid = ret->i_gid = 0; |
| 50 | 32 | ret->i_blocks = 0; |
| 51 | 33 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 52 | 34 | |
| ... | ... | @@ -137,25 +119,11 @@ |
| 137 | 119 | |
| 138 | 120 | static int __init xenfs_init(void) |
| 139 | 121 | { |
| 140 | - int err; | |
| 141 | - if (!xen_domain()) { | |
| 142 | - printk(KERN_INFO "xenfs: not registering filesystem on non-xen platform\n"); | |
| 143 | - return 0; | |
| 144 | - } | |
| 122 | + if (xen_domain()) | |
| 123 | + return register_filesystem(&xenfs_type); | |
| 145 | 124 | |
| 146 | - err = register_filesystem(&xenfs_type); | |
| 147 | - if (err) { | |
| 148 | - printk(KERN_ERR "xenfs: Unable to register filesystem!\n"); | |
| 149 | - goto out; | |
| 150 | - } | |
| 151 | - | |
| 152 | - err = bdi_init(&xenfs_backing_dev_info); | |
| 153 | - if (err) | |
| 154 | - unregister_filesystem(&xenfs_type); | |
| 155 | - | |
| 156 | - out: | |
| 157 | - | |
| 158 | - return err; | |
| 125 | + printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n"); | |
| 126 | + return 0; | |
| 159 | 127 | } |
| 160 | 128 | |
| 161 | 129 | static void __exit xenfs_exit(void) |