summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinsey Moore <kinsey.moore@oarcorp.com>2023-02-21 15:00:36 -0600
committerJoel Sherrill <joel@rtems.org>2023-03-15 13:29:12 -0500
commit8eb666fa96b788fb5e2649d9d5e4240aca82d50f (patch)
tree58323c12a926e47cb519f28f0d06a7c847debf0f
parentbsps/xnandpsu: Allow use of both chip selects (diff)
downloadrtems-8eb666fa96b788fb5e2649d9d5e4240aca82d50f.tar.bz2
cpukit/jffs2: Initialize and lock mutexes
Mutexes must be locked before they can be unlocked. JFFS2 doesn't currently see this as an issue because all mutex operations are no-ops.
-rw-r--r--cpukit/libfs/src/jffs2/src/dir-rtems.c2
-rw-r--r--cpukit/libfs/src/jffs2/src/fs-rtems.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/cpukit/libfs/src/jffs2/src/dir-rtems.c b/cpukit/libfs/src/jffs2/src/dir-rtems.c
index 9fa70bcec4..f9886c1266 100644
--- a/cpukit/libfs/src/jffs2/src/dir-rtems.c
+++ b/cpukit/libfs/src/jffs2/src/dir-rtems.c
@@ -214,6 +214,8 @@ int jffs2_mknod(
f = JFFS2_INODE_INFO(inode);
+ mutex_lock(&f->sem);
+
inode->i_size = datalen;
ri->isize = ri->dsize = ri->csize = cpu_to_je32(inode->i_size);
ri->totlen = cpu_to_je32(sizeof(*ri) + inode->i_size);
diff --git a/cpukit/libfs/src/jffs2/src/fs-rtems.c b/cpukit/libfs/src/jffs2/src/fs-rtems.c
index b863c74547..3be142a75f 100644
--- a/cpukit/libfs/src/jffs2/src/fs-rtems.c
+++ b/cpukit/libfs/src/jffs2/src/fs-rtems.c
@@ -1459,6 +1459,7 @@ void jffs2_iput(struct _inode *i)
static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)
{
memset(f, 0, sizeof(*f));
+ mutex_init(&f->sem);
}
static void jffs2_clear_inode (struct _inode *inode)
@@ -1543,6 +1544,7 @@ static int jffs2_read_inode (struct _inode *inode)
c = JFFS2_SB_INFO(inode->i_sb);
jffs2_init_inode_info(f);
+ mutex_lock(&f->sem);
ret = jffs2_do_read_inode(c, f, inode->i_ino, &latest_node);