From ce24180de8c4dcb4793bb7bffd3c187720c3d4b7 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 15 Feb 2017 21:04:03 -0600 Subject: [PATCH] libxfs: sync up FSGETXATTR names and definitions with the kernel The rest of xfsprogs uses FS_XFLAG values for FSGETXATTR as defined in the kernel, so we should do the same in io/cowextsize.c. Also, move the XFS_IOC_FSGETXATTR definition to the same part of xfs_fs.h as the kernel. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- io/cowextsize.c | 6 +++--- libxfs/xfs_fs.h | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/io/cowextsize.c b/io/cowextsize.c index b4a1c2ee8..c4cd6de24 100644 --- a/io/cowextsize.c +++ b/io/cowextsize.c @@ -50,7 +50,7 @@ get_cowextsize(const char *path, int fd) { struct fsxattr fsx; - if ((xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx)) < 0) { + if ((xfsctl(path, fd, FS_IOC_FSGETXATTR, &fsx)) < 0) { printf("%s: XFS_IOC_FSGETXATTR %s: %s\n", progname, path, strerror(errno)); return 0; @@ -69,7 +69,7 @@ set_cowextsize(const char *path, int fd, long extsz) perror("fstat64"); return 0; } - if ((xfsctl(path, fd, XFS_IOC_FSGETXATTR, &fsx)) < 0) { + if ((xfsctl(path, fd, FS_IOC_FSGETXATTR, &fsx)) < 0) { printf("%s: XFS_IOC_FSGETXATTR %s: %s\n", progname, path, strerror(errno)); return 0; @@ -83,7 +83,7 @@ set_cowextsize(const char *path, int fd, long extsz) } fsx.fsx_cowextsize = extsz; - if ((xfsctl(path, fd, XFS_IOC_FSSETXATTR, &fsx)) < 0) { + if ((xfsctl(path, fd, FS_IOC_FSSETXATTR, &fsx)) < 0) { printf("%s: XFS_IOC_FSSETXATTR %s: %s\n", progname, path, strerror(errno)); return 0; diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h index df58c1c7e..11fe42a82 100644 --- a/libxfs/xfs_fs.h +++ b/libxfs/xfs_fs.h @@ -56,9 +56,6 @@ struct dioattr { #define XFS_XFLAG_FILESTREAM FS_XFLAG_FILESTREAM #define XFS_XFLAG_HASATTR FS_XFLAG_HASATTR -#define XFS_IOC_FSGETXATTR FS_IOC_FSGETXATTR -#define XFS_IOC_FSSETXATTR FS_IOC_FSSETXATTR - /* * Structure for XFS_IOC_GETBMAP. * On input, fill in bmv_offset and bmv_length of the first structure @@ -508,6 +505,8 @@ typedef struct xfs_swapext #define XFS_IOC_ALLOCSP _IOW ('X', 10, struct xfs_flock64) #define XFS_IOC_FREESP _IOW ('X', 11, struct xfs_flock64) #define XFS_IOC_DIOINFO _IOR ('X', 30, struct dioattr) +#define XFS_IOC_FSGETXATTR FS_IOC_FSGETXATTR +#define XFS_IOC_FSSETXATTR FS_IOC_FSSETXATTR #define XFS_IOC_ALLOCSP64 _IOW ('X', 36, struct xfs_flock64) #define XFS_IOC_FREESP64 _IOW ('X', 37, struct xfs_flock64) #define XFS_IOC_GETBMAP _IOWR('X', 38, struct getbmap) -- 2.47.2