Commit 3398a400 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

xfs: remove XFS_HSIZE

XFS_HSIZE is an extremly confusing way to calculate the size of handle_t.
Given that handle_t always only had two sizes, and one of them isn't
even covered by XFS_HSIZE to start with just remove the macro and use
a constant sizeof expression.

Note that XFS_HSIZE isn't used in xfsprogs, xfsdump or xfstests either.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent d4ca1d55
...@@ -446,10 +446,6 @@ typedef struct xfs_handle { ...@@ -446,10 +446,6 @@ typedef struct xfs_handle {
} xfs_handle_t; } xfs_handle_t;
#define ha_fsid ha_u._ha_fsid #define ha_fsid ha_u._ha_fsid
#define XFS_HSIZE(handle) (((char *) &(handle).ha_fid.fid_pad \
- (char *) &(handle)) \
+ (handle).ha_fid.fid_len)
/* /*
* Structure passed to XFS_IOC_SWAPEXT * Structure passed to XFS_IOC_SWAPEXT
*/ */
......
...@@ -120,8 +120,7 @@ xfs_find_handle( ...@@ -120,8 +120,7 @@ xfs_find_handle(
handle.ha_fid.fid_pad = 0; handle.ha_fid.fid_pad = 0;
handle.ha_fid.fid_gen = inode->i_generation; handle.ha_fid.fid_gen = inode->i_generation;
handle.ha_fid.fid_ino = ip->i_ino; handle.ha_fid.fid_ino = ip->i_ino;
hsize = sizeof(xfs_handle_t);
hsize = XFS_HSIZE(handle);
} }
error = -EFAULT; error = -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment