diff mbox series

[Concept,05/12] linux: Add exportfs.h header with NFS export operations

Message ID 20260118133734.5.c5c8169071840a982d4d49530e8c4f4927c9b209@changeid
State New
Headers
Series ext4l: Continue reducing ext4_uboot.h size with more headers |

Commit Message

Simon Glass Jan. 18, 2026, 8:37 p.m. UTC 
  From: Simon Glass <simon.glass@canonical.com>

Create linux/exportfs.h with struct fid, export_operations, and
generic file handle encoder/decoder declarations for NFS export
support.

Update ext4_uboot.h to use the new header instead of duplicating
these definitions.

Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>

---

 fs/ext4l/ext4_uboot.h    | 38 ++------------------
 include/linux/exportfs.h | 78 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 35 deletions(-)
 create mode 100644 include/linux/exportfs.h
diff mbox series

Patch

diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h
index f686364a761..b6744894169 100644
--- a/fs/ext4l/ext4_uboot.h
+++ b/fs/ext4l/ext4_uboot.h
@@ -1259,34 +1259,8 @@  struct super_operations {
 	struct dentry *(*get_dquots)(struct inode *);
 };
 
-/* export_operations for NFS */
-struct export_operations {
-	int (*encode_fh)(struct inode *, __u32 *, int *, struct inode *);
-	struct dentry *(*fh_to_dentry)(struct super_block *, struct fid *, int, int);
-	struct dentry *(*fh_to_parent)(struct super_block *, struct fid *, int, int);
-	struct dentry *(*get_parent)(struct dentry *);
-	int (*commit_metadata)(struct inode *);
-};
-
-/* Generic file handle encoder for NFS exports - stub */
-static inline int generic_encode_ino32_fh(struct inode *inode, __u32 *fh,
-					  int *max_len, struct inode *parent)
-{
-	return 0;
-}
-
-/* fid for export_operations */
-struct fid {
-	union {
-		struct {
-			u32 ino;
-			u32 gen;
-			u32 parent_ino;
-			u32 parent_gen;
-		} i32;
-		__u32 raw[0];
-	};
-};
+/* export_operations and fid - use linux/exportfs.h */
+#include <linux/exportfs.h>
 
 /* uuid_to_fsid - convert UUID to fsid */
 static inline __kernel_fsid_t uuid_to_fsid(const u8 *uuid)
@@ -1433,13 +1407,7 @@  int inode_generic_drop(struct inode *inode);
 /* fsverity stubs (fscrypt macros are in ext4_fscrypt.h) */
 #define fsverity_cleanup_inode(i)	do { } while (0)
 
-/* NFS export helpers - declarations for stub.c */
-struct dentry *generic_fh_to_dentry(struct super_block *sb, struct fid *fid,
-				    int fh_len, int fh_type,
-				    struct inode *(*get_inode)(struct super_block *, u64, u32));
-struct dentry *generic_fh_to_parent(struct super_block *sb, struct fid *fid,
-				    int fh_len, int fh_type,
-				    struct inode *(*get_inode)(struct super_block *, u64, u32));
+/* NFS export helpers are now in linux/exportfs.h */
 
 /* Path operations */
 #define path_put(p)			do { } while (0)
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
new file mode 100644
index 00000000000..d42b9f63d15
--- /dev/null
+++ b/include/linux/exportfs.h
@@ -0,0 +1,78 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * NFS export operations for U-Boot
+ *
+ * Based on Linux exportfs.h - filesystem export support for NFS.
+ */
+#ifndef _LINUX_EXPORTFS_H
+#define _LINUX_EXPORTFS_H
+
+#include <linux/types.h>
+
+struct super_block;
+struct dentry;
+struct inode;
+
+/**
+ * struct fid - NFS file handle
+ *
+ * Flexible file handle for NFS export.
+ */
+struct fid {
+	union {
+		struct {
+			u32 ino;
+			u32 gen;
+			u32 parent_ino;
+			u32 parent_gen;
+		} i32;
+		__u32 raw[0];
+	};
+};
+
+/**
+ * struct export_operations - NFS export operations
+ * @encode_fh: encode file handle
+ * @fh_to_dentry: decode file handle to dentry
+ * @fh_to_parent: decode file handle to parent dentry
+ * @get_parent: get parent directory
+ * @commit_metadata: commit metadata changes
+ *
+ * Operations for NFS export support.
+ */
+struct export_operations {
+	int (*encode_fh)(struct inode *, __u32 *, int *, struct inode *);
+	struct dentry *(*fh_to_dentry)(struct super_block *, struct fid *,
+				       int, int);
+	struct dentry *(*fh_to_parent)(struct super_block *, struct fid *,
+				       int, int);
+	struct dentry *(*get_parent)(struct dentry *);
+	int (*commit_metadata)(struct inode *);
+};
+
+/**
+ * generic_encode_ino32_fh() - generic file handle encoder
+ * @inode: inode to encode
+ * @fh: file handle buffer
+ * @max_len: maximum length of buffer
+ * @parent: parent inode (may be NULL)
+ *
+ * U-Boot stub - returns 0.
+ */
+static inline int generic_encode_ino32_fh(struct inode *inode, __u32 *fh,
+					  int *max_len, struct inode *parent)
+{
+	return 0;
+}
+
+/* NFS export helpers - stubs for U-Boot */
+struct dentry *generic_fh_to_dentry(struct super_block *sb, struct fid *fid,
+				    int fh_len, int fh_type,
+				    struct inode *(*get_inode)(struct super_block *,
+							       u64, u32));
+struct dentry *generic_fh_to_parent(struct super_block *sb, struct fid *fid,
+				    int fh_len, int fh_type,
+				    struct inode *(*get_inode)(struct super_block *,
+							       u64, u32));
+
+#endif /* _LINUX_EXPORTFS_H */