| Message ID | 20210309155348.974875-6-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] fs: rename alloc_anon_inode to alloc_anon_inode_sb | expand |
On 09.03.21 16:53, Christoph Hellwig wrote: > Just use the generic anon_inode file system. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/misc/vmw_balloon.c | 24 ++---------------------- > 1 file changed, 2 insertions(+), 22 deletions(-) > > diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c > index 5d057a05ddbee8..be4be32f858253 100644 > --- a/drivers/misc/vmw_balloon.c > +++ b/drivers/misc/vmw_balloon.c > @@ -16,6 +16,7 @@ > //#define DEBUG > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > +#include <linux/anon_inodes.h> > #include <linux/types.h> > #include <linux/io.h> > #include <linux/kernel.h> > @@ -1735,20 +1736,6 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b) > > > #ifdef CONFIG_BALLOON_COMPACTION > - > -static int vmballoon_init_fs_context(struct fs_context *fc) > -{ > - return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM; > -} > - > -static struct file_system_type vmballoon_fs = { > - .name = "balloon-vmware", > - .init_fs_context = vmballoon_init_fs_context, > - .kill_sb = kill_anon_super, > -}; > - > -static struct vfsmount *vmballoon_mnt; > - > /** > * vmballoon_migratepage() - migrates a balloon page. > * @b_dev_info: balloon device information descriptor. > @@ -1878,8 +1865,6 @@ static void vmballoon_compaction_deinit(struct vmballoon *b) > iput(b->b_dev_info.inode); > > b->b_dev_info.inode = NULL; > - kern_unmount(vmballoon_mnt); > - vmballoon_mnt = NULL; > } > > /** > @@ -1895,13 +1880,8 @@ static void vmballoon_compaction_deinit(struct vmballoon *b) > */ > static __init int vmballoon_compaction_init(struct vmballoon *b) > { > - vmballoon_mnt = kern_mount(&vmballoon_fs); > - if (IS_ERR(vmballoon_mnt)) > - return PTR_ERR(vmballoon_mnt); > - > b->b_dev_info.migratepage = vmballoon_migratepage; > - b->b_dev_info.inode = alloc_anon_inode_sb(vmballoon_mnt->mnt_sb); > - > + b->b_dev_info.inode = alloc_anon_inode(); > if (IS_ERR(b->b_dev_info.inode)) > return PTR_ERR(b->b_dev_info.inode); > > Same comment regarding BALLOON_VMW_MAGIC and includes (mount.h, pseudo_fs.h). Apart from that looks good.
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 5d057a05ddbee8..be4be32f858253 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -16,6 +16,7 @@ //#define DEBUG #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/anon_inodes.h> #include <linux/types.h> #include <linux/io.h> #include <linux/kernel.h> @@ -1735,20 +1736,6 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b) #ifdef CONFIG_BALLOON_COMPACTION - -static int vmballoon_init_fs_context(struct fs_context *fc) -{ - return init_pseudo(fc, BALLOON_VMW_MAGIC) ? 0 : -ENOMEM; -} - -static struct file_system_type vmballoon_fs = { - .name = "balloon-vmware", - .init_fs_context = vmballoon_init_fs_context, - .kill_sb = kill_anon_super, -}; - -static struct vfsmount *vmballoon_mnt; - /** * vmballoon_migratepage() - migrates a balloon page. * @b_dev_info: balloon device information descriptor. @@ -1878,8 +1865,6 @@ static void vmballoon_compaction_deinit(struct vmballoon *b) iput(b->b_dev_info.inode); b->b_dev_info.inode = NULL; - kern_unmount(vmballoon_mnt); - vmballoon_mnt = NULL; } /** @@ -1895,13 +1880,8 @@ static void vmballoon_compaction_deinit(struct vmballoon *b) */ static __init int vmballoon_compaction_init(struct vmballoon *b) { - vmballoon_mnt = kern_mount(&vmballoon_fs); - if (IS_ERR(vmballoon_mnt)) - return PTR_ERR(vmballoon_mnt); - b->b_dev_info.migratepage = vmballoon_migratepage; - b->b_dev_info.inode = alloc_anon_inode_sb(vmballoon_mnt->mnt_sb); - + b->b_dev_info.inode = alloc_anon_inode(); if (IS_ERR(b->b_dev_info.inode)) return PTR_ERR(b->b_dev_info.inode);
Just use the generic anon_inode file system. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/misc/vmw_balloon.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)