From 85428036abfe5d2e8fc9caec8b573dc2dafed7ac Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 13 Aug 2020 21:53:59 +0800 Subject: [PATCH] fs/vfs: Don't check CONFIG_NFILE_STREAMS for mkdir/rename/rmdir/fs_unlink since these function don't depend on standard input/output function Signed-off-by: Xiang Xiao Change-Id: I011a387a1e2c1360e8f37716d512bd32f93ad467 --- fs/vfs/fs_mkdir.c | 12 +----------- fs/vfs/fs_rename.c | 12 +----------- fs/vfs/fs_rmdir.c | 12 +----------- fs/vfs/fs_unlink.c | 12 +----------- 4 files changed, 4 insertions(+), 44 deletions(-) diff --git a/fs/vfs/fs_mkdir.c b/fs/vfs/fs_mkdir.c index 957ba384f2e..5f18327074a 100644 --- a/fs/vfs/fs_mkdir.c +++ b/fs/vfs/fs_mkdir.c @@ -38,18 +38,8 @@ * Pre-processor Definitions ****************************************************************************/ -#undef FS_HAVE_WRITABLE_MOUNTPOINT -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_WRITABLE_MOUNTPOINT 1 -#endif - -#undef FS_HAVE_PSEUDOFS_OPERATIONS -#if !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_PSEUDOFS_OPERATIONS 1 -#endif - #undef FS_HAVE_MKDIR -#if defined(FS_HAVE_WRITABLE_MOUNTPOINT) || defined(FS_HAVE_PSEUDOFS_OPERATIONS) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) # define FS_HAVE_MKDIR 1 #endif diff --git a/fs/vfs/fs_rename.c b/fs/vfs/fs_rename.c index 28a3c906b0a..22545db84ec 100644 --- a/fs/vfs/fs_rename.c +++ b/fs/vfs/fs_rename.c @@ -39,18 +39,8 @@ * Pre-processor Definitions ****************************************************************************/ -#undef FS_HAVE_WRITABLE_MOUNTPOINT -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_WRITABLE_MOUNTPOINT 1 -#endif - -#undef FS_HAVE_PSEUDOFS_OPERATIONS -#if !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_PSEUDOFS_OPERATIONS 1 -#endif - #undef FS_HAVE_RENAME -#if defined(FS_HAVE_WRITABLE_MOUNTPOINT) || defined(FS_HAVE_PSEUDOFS_OPERATIONS) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) # define FS_HAVE_RENAME 1 #endif diff --git a/fs/vfs/fs_rmdir.c b/fs/vfs/fs_rmdir.c index bba87974ba7..2a98ea38acb 100644 --- a/fs/vfs/fs_rmdir.c +++ b/fs/vfs/fs_rmdir.c @@ -37,18 +37,8 @@ * Pre-processor Definitions ****************************************************************************/ -#undef FS_HAVE_WRITABLE_MOUNTPOINT -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_WRITABLE_MOUNTPOINT 1 -#endif - -#undef FS_HAVE_PSEUDOFS_OPERATIONS -#if !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_PSEUDOFS_OPERATIONS 1 -#endif - #undef FS_HAVE_RMDIR -#if defined(FS_HAVE_WRITABLE_MOUNTPOINT) || defined(FS_HAVE_PSEUDOFS_OPERATIONS) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) # define FS_HAVE_RMDIR 1 #endif diff --git a/fs/vfs/fs_unlink.c b/fs/vfs/fs_unlink.c index c63316bd86e..91c12ffe436 100644 --- a/fs/vfs/fs_unlink.c +++ b/fs/vfs/fs_unlink.c @@ -37,18 +37,8 @@ * Pre-processor Definitions ****************************************************************************/ -#undef FS_HAVE_WRITABLE_MOUNTPOINT -#if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_WRITABLE_MOUNTPOINT 1 -#endif - -#undef FS_HAVE_PSEUDOFS_OPERATIONS -#if !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_STREAMS > 0 -# define FS_HAVE_PSEUDOFS_OPERATIONS 1 -#endif - #undef FS_HAVE_UNLINK -#if defined(FS_HAVE_WRITABLE_MOUNTPOINT) || defined(FS_HAVE_PSEUDOFS_OPERATIONS) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) # define FS_HAVE_UNLINK 1 #endif