Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfs: remove XFS_HSIZE

Browse source 
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2017-06-14 21:30:44 -07:00 • committed by Darrick J. Wong
parent d4ca1d550d
commit 3398a4005f
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_fs.h
View file

@ -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
*/ */

3
fs/xfs/xfs_ioctl.c
View file

@ -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;