From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 08/15] xfs: use a union for i_cowextsize and i_flushiter
Date: Sat, 20 Jun 2020 09:10:55 +0200 [thread overview]
Message-ID: <20200620071102.462554-9-hch@lst.de> (raw)
In-Reply-To: <20200620071102.462554-1-hch@lst.de>
The i_cowextsize field is only used for v3 inodes, and the i_flushiter
field is only used for v1/v2 inodes. Use a union to pack the inode a
littler better after adding a few missing guards around their usage.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_inode_buf.c | 3 ++-
fs/xfs/xfs_inode.c | 6 ++++--
fs/xfs/xfs_inode.h | 7 +++++--
fs/xfs/xfs_ioctl.c | 6 +++++-
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 03bd7cdd0ddc81..8c4b7bd69285fa 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -205,7 +205,8 @@ xfs_inode_from_disk(
* inode. If the inode is unused, mode is zero and we shouldn't mess
* with the unitialized part of it.
*/
- ip->i_flushiter = be16_to_cpu(from->di_flushiter);
+ if (!xfs_sb_version_has_v3inode(&ip->i_mount->m_sb))
+ ip->i_flushiter = be16_to_cpu(from->di_flushiter);
inode->i_generation = be32_to_cpu(from->di_gen);
inode->i_mode = be16_to_cpu(from->di_mode);
if (!inode->i_mode)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 5e0336e0dbae44..fd111e05c0bb2e 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3794,8 +3794,10 @@ xfs_iflush_int(
xfs_inode_to_disk(ip, dip, iip->ili_item.li_lsn);
/* Wrap, we never let the log put out DI_MAX_FLUSH */
- if (ip->i_flushiter == DI_MAX_FLUSH)
- ip->i_flushiter = 0;
+ if (!xfs_sb_version_has_v3inode(&mp->m_sb)) {
+ if (ip->i_flushiter == DI_MAX_FLUSH)
+ ip->i_flushiter = 0;
+ }
xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);
if (XFS_IFORK_Q(ip))
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 581618ea1156da..a0444b9ce3f792 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -58,8 +58,11 @@ typedef struct xfs_inode {
xfs_rfsblock_t i_nblocks; /* # of direct & btree blocks */
uint32_t i_projid; /* owner's project id */
xfs_extlen_t i_extsize; /* basic/minimum extent size */
- xfs_extlen_t i_cowextsize; /* basic cow extent size */
- uint16_t i_flushiter; /* incremented on flush */
+ /* cowextsize is only used for v3 inodes, flushiter for v1/2 */
+ union {
+ xfs_extlen_t i_cowextsize; /* basic cow extent size */
+ uint16_t i_flushiter; /* incremented on flush */
+ };
struct xfs_icdinode i_d; /* most of ondisk inode */
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index a1937900ad84be..60544dd0f875b8 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1108,7 +1108,11 @@ xfs_fill_fsxattr(
simple_fill_fsxattr(fa, xfs_ip2xflags(ip));
fa->fsx_extsize = ip->i_extsize << ip->i_mount->m_sb.sb_blocklog;
- fa->fsx_cowextsize = ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog;
+ if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb) &&
+ (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) {
+ fa->fsx_cowextsize =
+ ip->i_cowextsize << ip->i_mount->m_sb.sb_blocklog;
+ }
fa->fsx_projid = ip->i_projid;
if (ifp && (ifp->if_flags & XFS_IFEXTENTS))
fa->fsx_nextents = xfs_iext_count(ifp);
--
2.26.2
next prev parent reply other threads:[~2020-06-20 7:11 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-20 7:10 xfs inode structure cleanups v2 Christoph Hellwig
2020-06-20 7:10 ` [PATCH 01/15] xfs: don't clear the "dinode core" in xfs_inode_alloc Christoph Hellwig
2020-06-22 7:11 ` Chandan Babu R
2020-06-30 17:58 ` Darrick J. Wong
2020-07-02 18:34 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 02/15] xfs: move the di_projid field to struct xfs_inode Christoph Hellwig
2020-06-22 7:55 ` Chandan Babu R
2020-06-30 17:44 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 03/15] xfs: move the di_size " Christoph Hellwig
2020-06-22 9:24 ` Chandan Babu R
2020-06-30 17:45 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 04/15] xfs: move the di_nblocks " Christoph Hellwig
2020-06-22 9:33 ` Chandan Babu R
2020-06-30 17:47 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 05/15] xfs: move the di_extsize " Christoph Hellwig
2020-06-22 9:36 ` Chandan Babu R
2020-06-30 17:47 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 06/15] xfs: move the di_cowextsize " Christoph Hellwig
2020-06-22 9:47 ` Chandan Babu R
2020-06-30 17:48 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 07/15] xfs: move the di_flushiter " Christoph Hellwig
2020-06-22 9:49 ` Chandan Babu R
2020-06-30 17:48 ` Darrick J. Wong
2020-06-20 7:10 ` Christoph Hellwig [this message]
2020-06-22 10:53 ` [PATCH 08/15] xfs: use a union for i_cowextsize and i_flushiter Chandan Babu R
2020-06-30 17:51 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 09/15] xfs: cleanup xfs_fill_fsxattr Christoph Hellwig
2020-06-22 11:01 ` Chandan Babu R
2020-06-30 17:52 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 10/15] xfs: move the di_forkoff field to struct xfs_inode Christoph Hellwig
2020-06-22 12:15 ` Chandan Babu R
2020-06-30 17:52 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 11/15] xfs: move the di_flags " Christoph Hellwig
2020-06-22 12:41 ` Chandan Babu R
2020-06-30 17:53 ` Darrick J. Wong
2020-06-20 7:10 ` [PATCH 12/15] xfs: move the di_flags2 " Christoph Hellwig
2020-06-22 12:51 ` Chandan Babu R
2020-06-22 13:23 ` Chandan Babu R
2020-06-24 7:25 ` Christoph Hellwig
2020-06-24 14:03 ` Darrick J. Wong
2020-06-24 14:10 ` Christoph Hellwig
2020-06-30 17:54 ` Darrick J. Wong
2020-06-20 7:11 ` [PATCH 13/15] xfs: move the di_crtime " Christoph Hellwig
2020-06-22 12:54 ` Chandan Babu R
2020-06-30 17:55 ` Darrick J. Wong
2020-06-20 7:11 ` [PATCH 14/15] xfs: move the di_dmevmask " Christoph Hellwig
2020-06-22 12:58 ` Chandan Babu R
2020-06-30 17:55 ` Darrick J. Wong
2020-06-20 7:11 ` [PATCH 15/15] xfs: move the di_dmstate " Christoph Hellwig
2020-06-22 13:18 ` Chandan Babu R
2020-06-30 17:56 ` Darrick J. Wong
2020-06-30 18:01 ` xfs inode structure cleanups v2 Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200620071102.462554-9-hch@lst.de \
--to=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).