Commit 9045d47e authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge

Revert "xen/privcmd: create address space to allow writable mmaps"

This reverts commit 24a89b5b.

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: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent fe61f1d7
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <linux/mm.h>
#include <linux/backing-dev.h>
#include <xen/xen.h> #include <xen/xen.h>
...@@ -24,28 +22,12 @@ ...@@ -24,28 +22,12 @@
MODULE_DESCRIPTION("Xen filesystem"); MODULE_DESCRIPTION("Xen filesystem");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int xenfs_set_page_dirty(struct page *page)
{
return !TestSetPageDirty(page);
}
static const struct address_space_operations xenfs_aops = {
.set_page_dirty = xenfs_set_page_dirty,
};
static struct backing_dev_info xenfs_backing_dev_info = {
.ra_pages = 0, /* No readahead */
.capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK,
};
static struct inode *xenfs_make_inode(struct super_block *sb, int mode) static struct inode *xenfs_make_inode(struct super_block *sb, int mode)
{ {
struct inode *ret = new_inode(sb); struct inode *ret = new_inode(sb);
if (ret) { if (ret) {
ret->i_mode = mode; ret->i_mode = mode;
ret->i_mapping->a_ops = &xenfs_aops;
ret->i_mapping->backing_dev_info = &xenfs_backing_dev_info;
ret->i_uid = ret->i_gid = 0; ret->i_uid = ret->i_gid = 0;
ret->i_blocks = 0; ret->i_blocks = 0;
ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
...@@ -137,25 +119,11 @@ static struct file_system_type xenfs_type = { ...@@ -137,25 +119,11 @@ static struct file_system_type xenfs_type = {
static int __init xenfs_init(void) static int __init xenfs_init(void)
{ {
int err; if (xen_domain())
if (!xen_domain()) { return register_filesystem(&xenfs_type);
printk(KERN_INFO "xenfs: not registering filesystem on non-xen platform\n");
return 0;
}
err = register_filesystem(&xenfs_type);
if (err) {
printk(KERN_ERR "xenfs: Unable to register filesystem!\n");
goto out;
}
err = bdi_init(&xenfs_backing_dev_info);
if (err)
unregister_filesystem(&xenfs_type);
out:
return err; printk(KERN_INFO "XENFS: not registering filesystem on non-xen platform\n");
return 0;
} }
static void __exit xenfs_exit(void) static void __exit xenfs_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment