From 1741a6a90d108ee38cf2dd94279d9c6fc32691d3 Mon Sep 17 00:00:00 2001
From: zhangdengyu <zhangdengyu2@huawei.com>
Date: Wed, 14 Dec 2022 10:26:32 +0800
Subject: [PATCH] =?UTF-8?q?fixed=204d8e88a=20from=20https://gitee.com/zhan?=
 =?UTF-8?q?gdengyu/third=5Fparty=5FFatFs/pulls/50=20fix:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dffconf.h=E4=B8=AD=E5=AE=8FFF=5FFS=5FLOCK=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E5=90=88=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

方案描述：
1、修改FF_FS_LOCK宏定义为：#define FF_FS_LOCK  (CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)
2、其中各个宏的含义如下：
2.1、CONFIG_NFILE_DESCRIPTORS 在vfs_config.h文件中定义，表示打开文件描述符fd的最大数量
2.2、LOSCFG_MAX_OPEN_DIRS 在vfs_config.h文件中定义，表示打开目录最大数量
2.3、MIN_START_FD 在vfs_config.h文件中定义，表示保留的三个文件描述符fd：stdin,stdout,stderr

BREAKING CHANGE：
修复ffconf.h中宏FF_FS_LOCK设置不合理的问题
修改后的FF_FS_LOCK宏定义为：#define FF_FS_LOCK	(CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)

Close: #I663SZ

Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>
Change-Id: I5389e57d4276e99d40c79cb5a449c6e5a1f1179e
---
 source/ffconf.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/ffconf.h b/source/ffconf.h
index 7b76aa0..87cfb62 100644
--- a/source/ffconf.h
+++ b/source/ffconf.h
@@ -10,6 +10,7 @@
 #include "los_config.h"
 #else
 #include "fs_config.h"
+#include "vfs_config.h"
 #endif
 
 #ifdef __cplusplus
@@ -315,7 +316,7 @@ enum STORAGE {
 #ifndef __LITEOS_M__
 #define FF_FS_LOCK	CONFIG_NFILE_DESCRIPTORS
 #else
-#define FF_FS_LOCK	64
+#define FF_FS_LOCK	(CONFIG_NFILE_DESCRIPTORS + LOSCFG_MAX_OPEN_DIRS - MIN_START_FD)
 #endif
 /* The option FF_FS_LOCK switches file lock function to control duplicated file open
 /  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
-- 
GitLab