| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <176246794254.2862990.15804158692251186166.stgit@frogsfrogsfrogs>
Date: Thu, 06 Nov 2025 14:37:27 -0800
From: "Darrick J. Wong" <djwong@...nel.org>
To: tytso@....edu
Cc: linux-ext4@...r.kernel.org
Subject: [PATCH 5/9] fuse2fs: move fs assignment closer to locking the bfl
From: Darrick J. Wong <djwong@...nel.org>
Move the "fs = ff->fs" statements closer to where we take the BFL so
that we can refactor them easily in the next patch.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
misc/fuse2fs.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 171eff246e272c..63c1227faa0d7a 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -1338,8 +1338,8 @@ static int op_readlink(const char *path, char *buf, size_t len)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: path=%s\n", __func__, path);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
err = ext2fs_namei(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, path, &ino);
if (err || ino == 0) {
@@ -1596,7 +1596,6 @@ static int op_mknod(const char *path, mode_t mode, dev_t dev)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: path=%s mode=0%o dev=0x%x\n", __func__, path, mode,
(unsigned int)dev);
temp_path = strdup(path);
@@ -1613,6 +1612,7 @@ static int op_mknod(const char *path, mode_t mode, dev_t dev)
a = *node_name;
*node_name = 0;
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 2)) {
ret = -ENOSPC;
@@ -1728,7 +1728,6 @@ static int op_mkdir(const char *path, mode_t mode)
int parent_sgid;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: path=%s mode=0%o\n", __func__, path, mode);
temp_path = strdup(path);
if (!temp_path) {
@@ -1744,6 +1743,7 @@ static int op_mkdir(const char *path, mode_t mode)
a = *node_name;
*node_name = 0;
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 1)) {
ret = -ENOSPC;
@@ -2191,7 +2191,6 @@ static int op_symlink(const char *src, const char *dest)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: symlink %s to %s\n", __func__, src, dest);
temp_path = strdup(dest);
if (!temp_path) {
@@ -2207,6 +2206,7 @@ static int op_symlink(const char *src, const char *dest)
a = *node_name;
*node_name = 0;
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 1)) {
ret = -ENOSPC;
@@ -2371,8 +2371,8 @@ static int op_rename(const char *from, const char *to
#endif
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: renaming %s to %s\n", __func__, from, to);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 5)) {
ret = -ENOSPC;
@@ -2605,7 +2605,6 @@ static int op_link(const char *src, const char *dest)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: src=%s dest=%s\n", __func__, src, dest);
temp_path = strdup(dest);
if (!temp_path) {
@@ -2621,6 +2620,7 @@ static int op_link(const char *src, const char *dest)
a = *node_name;
*node_name = 0;
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 2)) {
ret = -ENOSPC;
@@ -3161,9 +3161,9 @@ static int op_read(const char *path EXT2FS_ATTR((unused)), char *buf,
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d off=%jd len=%jd\n", __func__, fh->ino,
(intmax_t) offset, len);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
err = ext2fs_file_open(fs, fh->ino, fh->open_flags, &efp);
if (err) {
@@ -3218,9 +3218,9 @@ static int op_write(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d off=%jd len=%jd\n", __func__, fh->ino,
(intmax_t) offset, (intmax_t) len);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_writeable(fs)) {
ret = -EROFS;
@@ -3288,8 +3288,8 @@ static int op_release(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d\n", __func__, fh->ino);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if ((fp->flags & O_SYNC) &&
@@ -3322,10 +3322,10 @@ static int op_fsync(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d\n", __func__, fh->ino);
+ fs = ff->fs;
+ pthread_mutex_lock(&ff->bfl);
/* For now, flush everything, even if it's slow */
- pthread_mutex_lock(&ff->bfl);
if (fs_writeable(fs) && fh->open_flags & EXT2_FILE_WRITE) {
err = ext2fs_flush2(fs, 0);
if (err)
@@ -3864,9 +3864,9 @@ static int op_readdir(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- i.fs = ff->fs;
dbg_printf(ff, "%s: ino=%d offset=%llu\n", __func__, fh->ino,
(unsigned long long)offset);
+ i.fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
i.buf = buf;
i.func = fill_func;
@@ -3896,8 +3896,8 @@ static int op_access(const char *path, int mask)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: path=%s mask=0x%x\n", __func__, path, mask);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
err = ext2fs_namei(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, path, &ino);
if (err || ino == 0) {
@@ -3929,7 +3929,6 @@ static int op_create(const char *path, mode_t mode, struct fuse_file_info *fp)
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
- fs = ff->fs;
dbg_printf(ff, "%s: path=%s mode=0%o\n", __func__, path, mode);
temp_path = strdup(path);
if (!temp_path) {
@@ -3945,6 +3944,7 @@ static int op_create(const char *path, mode_t mode, struct fuse_file_info *fp)
a = *node_name;
*node_name = 0;
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_can_allocate(ff, 1)) {
ret = -ENOSPC;
@@ -4060,9 +4060,9 @@ static int op_ftruncate(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d len=%jd\n", __func__, fh->ino,
(intmax_t) len);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
if (!fs_writeable(fs)) {
ret = -EROFS;
@@ -4112,8 +4112,8 @@ static int op_fgetattr(const char *path EXT2FS_ATTR((unused)),
FUSE2FS_CHECK_CONTEXT(ff);
FUSE2FS_CHECK_HANDLE(ff, fh);
- fs = ff->fs;
dbg_printf(ff, "%s: ino=%d\n", __func__, fh->ino);
+ fs = ff->fs;
pthread_mutex_lock(&ff->bfl);
ret = stat_inode(fs, fh->ino, statbuf);
pthread_mutex_unlock(&ff->bfl);
Powered by blists - more mailing lists