diff mbox series

[Concept,13/21] isofs: Move struct isofs_options to isofs.h

Message ID	20260416165733.2923423-14-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Thu, 16 Apr 2026 10:57:03 -0600 Message-ID: <20260416165733.2923423-14-sjg@u-boot.org> In-Reply-To: <20260416165733.2923423-1-sjg@u-boot.org> References: <20260416165733.2923423-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 56PHLPGE426BR3KTZAWRKAEXN3TVFW5S CC: Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH 13/21] isofs: Move struct isofs_options to isofs.h Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/56PHLPGE426BR3KTZAWRKAEXN3TVFW5S/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	fs: Add ISO 9660 filesystem driver ported from Linux \| [Concept,00/21] fs: Add ISO 9660 filesystem driver ported from Linux [Concept,01/21] linux: Add magic.h with filesystem magic numbers [Concept,02/21] linux: Add unaligned.h redirect header [Concept,03/21] linux: Add NLS stubs with UTF-16 to UTF-8 conversion [Concept,04/21] linux: Add ISO 9660 on-disk structure definitions [Concept,05/21] linux: dcache: Add d_op field to struct dentry [Concept,06/21] linux: buffer_head: Implement map_bh() properly [Concept,07/21] linux: fs: Add shared VFS function declarations [Concept,08/21] ext4l: Fix alloc_inode_sb() to actually allocate [Concept,09/21] fs: Move common Linux VFS functions to fs/linux_fs.c [Concept,10/21] fs: Add ISO 9660 filesystem source from Linux [Concept,11/21] isofs: Add include guards and U-Boot compat to headers [Concept,12/21] isofs: Replace Linux includes in source files [Concept,13/21] isofs: Move struct isofs_options to isofs.h [Concept,14/21] inode.c: Remove Linux module and fs_context code [Concept,15/21] inode.c: Adapt for U-Boot environment [Concept,16/21] dir.c: Advance ctx->pos before dir_emit() calls [Concept,17/21] dir.c: Remove setlease from file_operations [Concept,18/21] fs: Add ISO 9660 U-Boot integration layer [Concept,19/21] test: Add VFS tests for ISO 9660 filesystems [Concept,20/21] docker: Add genisoimage for ISO 9660 tests [Concept,21/21] CI: Update container to noble-20251001-13Apr2026

Commit Message

Simon Glass April 16, 2026, 4:57 p.m. UTC

  From: Simon Glass <sjg@chromium.org>

The struct isofs_options is defined locally in inode.c, but the
U-Boot integration layer (interface.c) also needs access to set
up mount options when probing an ISO 9660 filesystem.

Move the struct definition to isofs.h so it is visible to both
inode.c and interface.c.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 fs/isofs/inode.c | 23 +----------------------
 fs/isofs/isofs.h | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 22 deletions(-)

diff mbox series

Patch

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 4d0c83eb5df..e50664b29e9 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -131,28 +131,7 @@  static const struct dentry_operations isofs_dentry_ops[] = {
 #endif
 };
 
-struct isofs_options{
-	unsigned int rock:1;
-	unsigned int joliet:1;
-	unsigned int cruft:1;
-	unsigned int hide:1;
-	unsigned int showassoc:1;
-	unsigned int nocompress:1;
-	unsigned int overriderockperm:1;
-	unsigned int uid_set:1;
-	unsigned int gid_set:1;
-	unsigned char map;
-	unsigned char check;
-	unsigned int blocksize;
-	umode_t fmode;
-	umode_t dmode;
-	kgid_t gid;
-	kuid_t uid;
-	char *iocharset;
-	/* LVE */
-	s32 session;
-	s32 sbsector;
-};
+/* struct isofs_options is defined in isofs.h */
 
 /*
  * Compute the hash for the isofs name corresponding to the dentry.
diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h
index 66a21648623..95d85f58733 100644
--- a/fs/isofs/isofs.h
+++ b/fs/isofs/isofs.h
@@ -202,6 +202,32 @@  isofs_normalize_block_and_offset(struct iso_directory_record *de,
 	}
 }
 
+/*
+ * Mount options - defined here so interface.c can set them up.
+ */
+struct isofs_options{
+	unsigned int rock:1;
+	unsigned int joliet:1;
+	unsigned int cruft:1;
+	unsigned int hide:1;
+	unsigned int showassoc:1;
+	unsigned int nocompress:1;
+	unsigned int overriderockperm:1;
+	unsigned int uid_set:1;
+	unsigned int gid_set:1;
+	unsigned char map;
+	unsigned char check;
+	unsigned int blocksize;
+	umode_t fmode;
+	umode_t dmode;
+	kgid_t gid;
+	kuid_t uid;
+	char *iocharset;
+	/* LVE */
+	s32 session;
+	s32 sbsector;
+};
+
 extern const struct inode_operations isofs_dir_inode_operations;
 extern const struct file_operations isofs_dir_operations;
 extern const struct address_space_operations isofs_symlink_aops;