xfs: move xfs_ino_geometry to xfs_mount.h

PATCH Superseded Darrick J. Wong 3 participants 6 messages Jun 18, 2019 – Jun 25, 2019 XFS filesystem

lore

Share & tools

lore

Darrick J. Wong

author

2019-06-18 21:00 UTC #0 lore raw

PATCH 1/1 xfs: move xfs_ino_geometry to xfs_mount.h

From: Darrick J. Wong <[email protected]>

The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_mount.h.

Signed-off-by Darrick J. Wong <[email protected]>

---
 fs/xfs/libxfs/xfs_format.h |   41 -----------------------------------------
 fs/xfs/xfs_mount.h         |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 41 deletions(-)

fs/xfs/libxfs/xfs_format.h +0 ~~-41~~

index 5729474e362f..c968b60cee15 100644
@@ -1694,45 +1694,4 @@ struct xfs_acl {
 #define SGI_ACL_FILE_SIZE	(sizeof(SGI_ACL_FILE)-1)
 #define SGI_ACL_DEFAULT_SIZE	(sizeof(SGI_ACL_DEFAULT)-1)
 
-struct xfs_ino_geometry {
-	/* Maximum inode count in this filesystem. */
-	uint64_t	maxicount;
-
-	/* Actual inode cluster buffer size, in bytes. */
-	unsigned int	inode_cluster_size;
-
-	/*
-	 * Desired inode cluster buffer size, in bytes.  This value is not
-	 * rounded up to at least one filesystem block, which is necessary for
-	 * the sole purpose of validating sb_spino_align.  Runtime code must
-	 * only ever use inode_cluster_size.
-	 */
-	unsigned int	inode_cluster_size_raw;
-
-	/* Inode cluster sizes, adjusted to be at least 1 fsb. */
-	unsigned int	inodes_per_cluster;
-	unsigned int	blocks_per_cluster;
-
-	/* Inode cluster alignment. */
-	unsigned int	cluster_align;
-	unsigned int	cluster_align_inodes;
-	unsigned int	inoalign_mask;	/* mask sb_inoalignmt if used */
-
-	unsigned int	inobt_mxr[2]; /* max inobt btree records */
-	unsigned int	inobt_mnr[2]; /* min inobt btree records */
-	unsigned int	inobt_maxlevels; /* max inobt btree levels. */
-
-	/* Size of inode allocations under normal operation. */
-	unsigned int	ialloc_inos;
-	unsigned int	ialloc_blks;
-
-	/* Minimum inode blocks for a sparse allocation. */
-	unsigned int	ialloc_min_blks;
-
-	/* stripe unit inode alignment */
-	unsigned int	ialloc_align;
-
-	unsigned int	agino_log;	/* #bits for agino in inum */
-};
-
 #endif /* __XFS_FORMAT_H__ */

fs/xfs/xfs_mount.h +42 -0

48 lines not on this page · raw message

Dave Chinner

2019-06-19 00:41 UTC #1 lore raw

Quoted 4 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>
The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_mount.h.

That means we have to duplicate it in userspace - xfs_mount.h is not shared. I'd suggest that libxfs/xfs_shared.h would be a better place for it.

Cheers,

Dave.

Signature · 2 lines

Dave Chinner
[email protected]

Darrick J. Wong

author

2019-06-19 01:07 UTC #2 lore raw

Quoted 9 lines · Dave Chinner

Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_mount.h.
That means we have to duplicate it in userspace - xfs_mount.h is not shared. I'd suggest that libxfs/xfs_shared.h would be a better place for it.

Well that will make the patch wayyy bigger since now every file has to include xfs_shared.h (right now 26 of them do not)...

--D

Quoted 6 lines

Cheers,
Dave.
Signature · 2 lines
Dave Chinner
[email protected]

Darrick J. Wong

author

2019-06-19 01:13 UTC #3 lore raw

PATCH v2 1/1 xfs: move xfs_ino_geometry to xfs_shared.h

In reply to Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_shared.h.

Signed-off-by Darrick J. Wong <[email protected]>

---
v2: move it to xfs_shared.h, which now every file has to include

---
 fs/xfs/libxfs/xfs_dir2.c       |    1 +
 fs/xfs/libxfs/xfs_dir2_block.c |    1 +
 fs/xfs/libxfs/xfs_dir2_data.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_leaf.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_node.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_sf.c    |    1 +
 fs/xfs/libxfs/xfs_format.h     |   41 ---------------------------------------
 fs/xfs/libxfs/xfs_iext_tree.c  |    1 +
 fs/xfs/libxfs/xfs_inode_fork.c |    1 +
 fs/xfs/libxfs/xfs_shared.h     |   42 ++++++++++++++++++++++++++++++++++++++++
 fs/xfs/xfs_acl.c               |    1 +
 fs/xfs/xfs_attr_list.c         |    1 +
 fs/xfs/xfs_buf.c               |    1 +
 fs/xfs/xfs_buf_item.c          |    1 +
 fs/xfs/xfs_dir2_readdir.c      |    1 +
 fs/xfs/xfs_discard.c           |    1 +
 fs/xfs/xfs_dquot_item.c        |    1 +
 fs/xfs/xfs_error.c             |    1 +
 fs/xfs/xfs_export.c            |    1 +
 fs/xfs/xfs_filestream.c        |    1 +
 fs/xfs/xfs_icache.c            |    1 +
 fs/xfs/xfs_inode_item.c        |    1 +
 fs/xfs/xfs_ioctl32.c           |    1 +
 fs/xfs/xfs_message.c           |    1 +
 fs/xfs/xfs_pnfs.c              |    1 +
 fs/xfs/xfs_qm_bhv.c            |    1 +
 fs/xfs/xfs_quotaops.c          |    1 +
 fs/xfs/xfs_trans_ail.c         |    1 +
 fs/xfs/xfs_xattr.c             |    1 +
 29 files changed, 69 insertions(+), 41 deletions(-)

fs/xfs/libxfs/xfs_dir2.c +1 -0

index 156ce95c9c45..b25f75032baa 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_dir2_block.c +1 -0

index b7d6d78f4ce2..c73183373dd1 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_dir2_data.c +1 -0

index b7b9ce002cb9..efbb009d3d65 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_dir2_leaf.c +1 -0

index 9c2a0a13ed61..ce75313d7ed6 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_dir2_node.c +1 -0

index 16731d2d684b..0a8fa453a7c6 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_dir2_sf.c +1 -0

index 585dfdb7b6b6..57911731c516 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_format.h +0 ~~-41~~

45 lines not on this page · raw message

fs/xfs/libxfs/xfs_iext_tree.c +1 -0

index bc690f2409fa..a2beca47eead 100644
@@ -7,6 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_bit.h"
 #include "xfs_log_format.h"

fs/xfs/libxfs/xfs_inode_fork.c +1 -0

index f9acf1d436f6..642ef9ed5f57 100644
@@ -7,6 +7,7 @@
 
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/libxfs/xfs_shared.h +42 -0

46 lines not on this page · raw message

fs/xfs/xfs_acl.c +1 -0

index 8039e35147dd..f6af069d4270 100644
@@ -4,6 +4,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_attr_list.c +1 -0

index 3d213a7394c5..7ffee91a9fdb 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_buf.c +1 -0

index be8afa1673c7..e860114e8c9b 100644
@@ -22,6 +22,7 @@
 #include <linux/backing-dev.h>
 #include <linux/freezer.h>
 
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_buf_item.c +1 -0

index 65b32acfa0f6..3823f3f5bde9 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_dir2_readdir.c +1 -0

index 5142e64e2345..ea7b9d35d30b 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_discard.c +1 -0

index d0df0ed50f4b..4f5460be4357 100644
@@ -4,6 +4,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_dquot_item.c +1 -0

index 87b23ae44397..cd7142df596c 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_error.c +1 -0

index a1e177f66404..7cc799b67232 100644
@@ -4,6 +4,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_fs.h"
 #include "xfs_log_format.h"

fs/xfs/xfs_export.c +1 -0

index f2284ceb129f..e179bea0474d 100644
@@ -4,6 +4,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_filestream.c +1 -0

index 182501373af2..b1869aebb263 100644
@@ -5,6 +5,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_icache.c +1 -0

index a76b27565a18..336501694443 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_inode_item.c +1 -0

index fa1c4fe2ffbf..957f3dca0d7a 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_ioctl32.c +1 -0

index 614fc6886d24..0f20385ec3c6 100644
@@ -11,6 +11,7 @@
 #include <linux/fsmap.h>
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_message.c +1 -0

index 6b736ea58d35..6cb1f2468dd0 100644
@@ -6,6 +6,7 @@
 #include "xfs.h"
 #include "xfs_fs.h"
 #include "xfs_error.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_pnfs.c +1 -0

index bde2c9f56a46..2d95355a8a0a 100644
@@ -4,6 +4,7 @@
  */
 #include <linux/iomap.h>
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_qm_bhv.c +1 -0

index 3091e4bc04ef..8f03478dabea 100644
@@ -5,6 +5,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_quotaops.c +1 -0

index a7c0c657dfaf..d453c2c32e04 100644
@@ -4,6 +4,7 @@
  * All Rights Reserved.
  */
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_trans_ail.c +1 -0

index d3a4e89bf4a0..58013696778d 100644
@@ -6,6 +6,7 @@
  */
 #include "xfs.h"
 #include "xfs_fs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

fs/xfs/xfs_xattr.c +1 -0

index 9a63016009a1..3bf275fd7487 100644
@@ -5,6 +5,7 @@
  */
 
 #include "xfs.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"

Dave Chinner

Reviewed-by on v2 1/1

2019-06-20 21:32 UTC #4 lore raw

Re: [PATCH v2] xfs: move xfs_ino_geometry to xfs_shared.h

Quoted 31 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_shared.h.

Signed-off-by Darrick J. Wong <[email protected]>

---
v2: move it to xfs_shared.h, which now every file has to include

---
 fs/xfs/libxfs/xfs_dir2.c       |    1 +
 fs/xfs/libxfs/xfs_dir2_block.c |    1 +
 fs/xfs/libxfs/xfs_dir2_data.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_leaf.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_node.c  |    1 +
 fs/xfs/libxfs/xfs_dir2_sf.c    |    1 +
 fs/xfs/libxfs/xfs_format.h     |   41 ---------------------------------------
 fs/xfs/libxfs/xfs_iext_tree.c  |    1 +
 fs/xfs/libxfs/xfs_inode_fork.c |    1 +
 fs/xfs/libxfs/xfs_shared.h     |   42 ++++++++++++++++++++++++++++++++++++++++
 fs/xfs/xfs_acl.c               |    1 +
 fs/xfs/xfs_attr_list.c         |    1 +
 fs/xfs/xfs_buf.c               |    1 +
 fs/xfs/xfs_buf_item.c          |    1 +
 fs/xfs/xfs_dir2_readdir.c      |    1 +
 fs/xfs/xfs_discard.c           |    1 +
 fs/xfs/xfs_dquot_item.c        |    1 +
 fs/xfs/xfs_error.c             |    1 +
 fs/xfs/xfs_export.c            |    1 +
 fs/xfs/xfs_filestream.c        |    1 +
 fs/xfs/xfs_icache.c            |    1 +
 fs/xfs/xfs_inode_item.c        |    1 +

Quoted 8 lines

 fs/xfs/xfs_ioctl32.c           |    1 +
 fs/xfs/xfs_message.c           |    1 +
 fs/xfs/xfs_pnfs.c              |    1 +
 fs/xfs/xfs_qm_bhv.c            |    1 +
 fs/xfs/xfs_quotaops.c          |    1 +
 fs/xfs/xfs_trans_ail.c         |    1 +
 fs/xfs/xfs_xattr.c             |    1 +
 29 files changed, 69 insertions(+), 41 deletions(-)

Bigger patch, but I think it's the right way to do this.

Reviewed-by Dave Chinner <[email protected]>

Signature · 2 lines

Dave Chinner
[email protected]

Christoph Hellwig

Reviewed-by on v2 1/1

2019-06-25 14:29 UTC #5 lore raw

Re: [PATCH v2] xfs: move xfs_ino_geometry to xfs_shared.h

In reply to Darrick J. Wong

Quoted 6 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>
The inode geometry structure isn't related to ondisk format; it's support for the mount structure. Move it to xfs_shared.h.
Signed-off-by Darrick J. Wong <[email protected]>

Looks good,

Reviewed-by Christoph Hellwig <[email protected]>