aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-16 11:06:46 -0800
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-11-16 11:06:46 -0800
commitfe61f1d737f7804e0bd440ace9724e669e2c2906 (patch)
treebe4c179d2d8c84ab104c5da499a275eeb3adb70d
parentMerge commit 'v2.6.37-rc2' into upstream/xenfs (diff)
downloadlinux-dev-fe61f1d737f7804e0bd440ace9724e669e2c2906.tar.xz
linux-dev-fe61f1d737f7804e0bd440ace9724e669e2c2906.zip
xen/xenfs: update xenfs_mount for new prototype
.mount now returns a struct dentry *. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
-rw-r--r--drivers/xen/xenfs/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index f6339d11d59c..990ee42167a1 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -121,9 +121,9 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
return rc;
}
-static int xenfs_mount(struct file_system_type *fs_type,
- int flags, const char *dev_name,
- void *data)
+static struct dentry *xenfs_mount(struct file_system_type *fs_type,
+ int flags, const char *dev_name,
+ void *data)
{
return mount_single(fs_type, flags, data, xenfs_fill_super);
}