Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 4.12 compat: fix super_setup_bdi_name() call 

Provide a format parameter to super_setup_bdi_name() so we don't
create duplicate names in '/devices/virtual/bdi' sysfs namespace which
would prevent us from mounting more than one ZFS filesystem at a time.

Reviewed-by: Chunwei Chen <david.chen@osnexus.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #6147
This commit is contained in:
LOLi 2017-05-25 18:55:55 +02:00 committed by Tony Hutter
parent 21fd04ec40
commit cb8210d125
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/vfs_compat.h
View File

@ -73,10 +73,13 @@ truncate_setsize(struct inode *ip, loff_t new)
* 4.12 - x.y, super_setup_bdi_name() new interface. * 4.12 - x.y, super_setup_bdi_name() new interface.
*/ */
#if defined(HAVE_SUPER_SETUP_BDI_NAME) #if defined(HAVE_SUPER_SETUP_BDI_NAME)
extern atomic_long_t zfs_bdi_seq;
static inline int static inline int
zpl_bdi_setup(struct super_block *sb, char *name) zpl_bdi_setup(struct super_block *sb, char *name)
{ {
return (super_setup_bdi_name(sb, name)); return super_setup_bdi_name(sb, "%.28s-%ld", name,
atomic_long_inc_return(&zfs_bdi_seq));
} }
static inline void static inline void
zpl_bdi_destroy(struct super_block *sb) zpl_bdi_destroy(struct super_block *sb)
@ -143,7 +146,6 @@ static inline int
zpl_bdi_setup(struct super_block *sb, char *name) zpl_bdi_setup(struct super_block *sb, char *name)
{ {
struct backing_dev_info *bdi; struct backing_dev_info *bdi;
char tmp[32];
int error; int error;
bdi = kmem_zalloc(sizeof (struct backing_dev_info), KM_SLEEP); bdi = kmem_zalloc(sizeof (struct backing_dev_info), KM_SLEEP);
@ -156,8 +158,7 @@ zpl_bdi_setup(struct super_block *sb, char *name)
return (error); return (error);
} }
sprintf(tmp, "%.28s%s", name, "-%d"); error = bdi_register(bdi, NULL, "%.28s-%ld", name,
error = bdi_register(bdi, NULL, tmp,
atomic_long_inc_return(&zfs_bdi_seq)); atomic_long_inc_return(&zfs_bdi_seq));
if (error) { if (error) {
bdi_destroy(bdi); bdi_destroy(bdi);

3
module/zfs/zfs_vfsops.c
View File

@ -1374,8 +1374,7 @@ zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting)
} }
EXPORT_SYMBOL(zfs_sb_teardown); EXPORT_SYMBOL(zfs_sb_teardown);
#if !defined(HAVE_SUPER_SETUP_BDI_NAME) && \ #if !defined(HAVE_2ARGS_BDI_SETUP_AND_REGISTER) && \
!defined(HAVE_2ARGS_BDI_SETUP_AND_REGISTER) && \
!defined(HAVE_3ARGS_BDI_SETUP_AND_REGISTER) !defined(HAVE_3ARGS_BDI_SETUP_AND_REGISTER)
atomic_long_t zfs_bdi_seq = ATOMIC_LONG_INIT(0); atomic_long_t zfs_bdi_seq = ATOMIC_LONG_INIT(0);
#endif #endif