From ee8abb8160ace0f3f3a08290ef6b0795c393c9b7 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 4 Mar 2017 08:25:20 -0600 Subject: [PATCH] FS: Don't build block driver proxy if PSEUDOFS_OPERATIONS are disabled. --- fs/driver/Make.defs | 3 +++ fs/driver/fs_blockproxy.c | 5 +++-- fs/vfs/fs_open.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/driver/Make.defs b/fs/driver/Make.defs index 382eaf5ab40..12bde01d439 100644 --- a/fs/driver/Make.defs +++ b/fs/driver/Make.defs @@ -44,8 +44,11 @@ CSRCS += fs_registerdriver.c fs_unregisterdriver.c ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y) CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c CSRCS += fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c + +ifneq ($(CONFIG_DISABLE_PSEUDOFS_OPERATIONS),y) CSRCS += fs_blockproxy.c endif +endif # CONFIG_DISABLE_MOUNTPOINT # Include driver build support diff --git a/fs/driver/fs_blockproxy.c b/fs/driver/fs_blockproxy.c index 49f43076cb0..b03aa4f95eb 100644 --- a/fs/driver/fs_blockproxy.c +++ b/fs/driver/fs_blockproxy.c @@ -55,7 +55,8 @@ #include #include -#if !defined(CONFIG_DISABLE_MOUNTPOINT) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) && \ + !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) /**************************************************************************** * Private Data @@ -230,4 +231,4 @@ errout_with_chardev: return ret; } -#endif /* !CONFIG_DISABLE_MOUNTPOINT */ +#endif /* !CONFIG_DISABLE_MOUNTPOINT && !CONFIG_DISABLE_PSEUDOFS_OPERATIONS */ diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c index c54dcfe24b0..f0347828656 100644 --- a/fs/vfs/fs_open.c +++ b/fs/vfs/fs_open.c @@ -140,7 +140,8 @@ int open(const char *path, int oflags, ...) inode = desc.node; DEBUGASSERT(inode != NULL); -#if !defined(CONFIG_DISABLE_MOUNTPOINT) +#if !defined(CONFIG_DISABLE_MOUNTPOINT) && \ + !defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS) /* If the inode is block driver, then we may return a character driver * proxy for the block driver. block_proxy() will instantiate a BCH * character driver wrapper around the block driver, open(), then