Commit 5f33771f authored by Namjae Jeon's avatar Namjae Jeon Committed by Greg Kroah-Hartman
Browse files

staging: exfat: add STAGING prefix to config names 



Add STAGING prefix to config names to avoid collsion with fs/exfat config.

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Link: https://lore.kernel.org/r/20200103011345.25245-1-namjae.jeon@samsung.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 97806d36

drivers/staging/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ 
obj-$(CONFIG_KPC2000)		+= kpc2000/

obj-$(CONFIG_UWB)		+= uwb/

obj-$(CONFIG_USB_WUSB)		+= wusbcore/

obj-$(CONFIG_EXFAT_FS)		+= exfat/

obj-$(CONFIG_STAGING_EXFAT_FS)	+= exfat/

obj-$(CONFIG_QLGE)		+= qlge/

obj-$(CONFIG_NET_VENDOR_HP)	+= hp/

obj-$(CONFIG_WFX)		+= wfx/

drivers/staging/exfat/Kconfig

+13 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config EXFAT_FS

config STAGING_EXFAT_FS

	tristate "exFAT fs support"

	depends on BLOCK

	select NLS

	help

	  This adds support for the exFAT file system.



config EXFAT_DISCARD

config STAGING_EXFAT_DISCARD

	bool "enable discard support"

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	default y



config EXFAT_DELAYED_SYNC

config STAGING_EXFAT_DELAYED_SYNC

	bool "enable delayed sync"

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	default n



config EXFAT_KERNEL_DEBUG

config STAGING_EXFAT_KERNEL_DEBUG

	bool "enable kernel debug features via ioctl"

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	default n



config EXFAT_DEBUG_MSG

config STAGING_EXFAT_DEBUG_MSG

	bool "print debug messages"

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	default n



config EXFAT_DEFAULT_CODEPAGE

config STAGING_EXFAT_DEFAULT_CODEPAGE

	int "Default codepage for exFAT"

	default 437

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	help

	  This option should be set to the codepage of your exFAT filesystems.



config EXFAT_DEFAULT_IOCHARSET

config STAGING_EXFAT_DEFAULT_IOCHARSET

	string "Default iocharset for exFAT"

	default "utf8"

	depends on EXFAT_FS

	depends on STAGING_EXFAT_FS

	help

	  Set this to the default input/output character set you'd like exFAT to use.

drivers/staging/exfat/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-or-later



obj-$(CONFIG_EXFAT_FS) += exfat.o

obj-$(CONFIG_STAGING_EXFAT_FS) += exfat.o



exfat-y :=	exfat_core.o	\

		exfat_super.o	\

drivers/staging/exfat/exfat.h

+7 −7
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/types.h>

#include <linux/buffer_head.h>



#ifdef CONFIG_EXFAT_KERNEL_DEBUG

#ifdef CONFIG_STAGING_EXFAT_KERNEL_DEBUG

  /* For Debugging Purpose */

	/* IOCTL code 'f' used by

	 *   - file systems typically #0~0x1F
@@ -22,9 +22,9 @@ 


#define EXFAT_DEBUGFLAGS_INVALID_UMOUNT	0x01

#define EXFAT_DEBUGFLAGS_ERROR_RW	0x02

#endif /* CONFIG_EXFAT_KERNEL_DEBUG */

#endif /* CONFIG_STAGING_EXFAT_KERNEL_DEBUG */



#ifdef CONFIG_EXFAT_DEBUG_MSG

#ifdef CONFIG_STAGING_EXFAT_DEBUG_MSG

#define DEBUG	1

#else

#undef DEBUG
@@ -661,10 +661,10 @@ struct exfat_mount_options { 


	/* on error: continue, panic, remount-ro */

	unsigned char errors;

#ifdef CONFIG_EXFAT_DISCARD

#ifdef CONFIG_STAGING_EXFAT_DISCARD

	/* flag on if -o dicard specified and device support discard() */

	unsigned char discard;

#endif /* CONFIG_EXFAT_DISCARD */

#endif /* CONFIG_STAGING_EXFAT_DISCARD */

};



#define EXFAT_HASH_BITS		8
@@ -700,9 +700,9 @@ struct exfat_sb_info { 


	spinlock_t inode_hash_lock;

	struct hlist_head inode_hashtable[EXFAT_HASH_SIZE];

#ifdef CONFIG_EXFAT_KERNEL_DEBUG

#ifdef CONFIG_STAGING_EXFAT_KERNEL_DEBUG

	long debug_flags;

#endif /* CONFIG_EXFAT_KERNEL_DEBUG */

#endif /* CONFIG_STAGING_EXFAT_KERNEL_DEBUG */

};



/*

drivers/staging/exfat/exfat_blkdev.c

+6 −6
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ int exfat_bdev_read(struct super_block *sb, sector_t secno, struct buffer_head * 
{

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

#ifdef CONFIG_EXFAT_KERNEL_DEBUG

#ifdef CONFIG_STAGING_EXFAT_KERNEL_DEBUG

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	long flags = sbi->debug_flags;



	if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)

		return -EIO;

#endif /* CONFIG_EXFAT_KERNEL_DEBUG */

#endif /* CONFIG_STAGING_EXFAT_KERNEL_DEBUG */



	if (!p_bd->opened)

		return -ENODEV;
@@ -72,13 +72,13 @@ int exfat_bdev_write(struct super_block *sb, sector_t secno, struct buffer_head 
	struct buffer_head *bh2;

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);

	struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);

#ifdef CONFIG_EXFAT_KERNEL_DEBUG

#ifdef CONFIG_STAGING_EXFAT_KERNEL_DEBUG

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	long flags = sbi->debug_flags;



	if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)

		return -EIO;

#endif /* CONFIG_EXFAT_KERNEL_DEBUG */

#endif /* CONFIG_STAGING_EXFAT_KERNEL_DEBUG */



	if (!p_bd->opened)

		return -ENODEV;
@@ -121,13 +121,13 @@ no_bh: 
int exfat_bdev_sync(struct super_block *sb)

{

	struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);

#ifdef CONFIG_EXFAT_KERNEL_DEBUG

#ifdef CONFIG_STAGING_EXFAT_KERNEL_DEBUG

	struct exfat_sb_info *sbi = EXFAT_SB(sb);

	long flags = sbi->debug_flags;



	if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)

		return -EIO;

#endif /* CONFIG_EXFAT_KERNEL_DEBUG */

#endif /* CONFIG_STAGING_EXFAT_KERNEL_DEBUG */



	if (!p_bd->opened)

		return -ENODEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE