|
 |
e59f31 |
xfs.h: define XFS_IOC_FREEZE even if FIFREEZE is defined
|
|
|
e59f31 |
|
|
|
e59f31 |
And the same for XFS_IOC_THAW. Just because we now have a common
|
|
|
e59f31 |
version of the ioctl we still need to provide the old name for it
|
|
|
e59f31 |
for anyone using those.
|
|
|
e59f31 |
|
|
|
e59f31 |
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
|
e59f31 |
|
|
|
e59f31 |
linux.h: include <linux/fs.h>
|
|
|
e59f31 |
|
|
|
e59f31 |
To reliably prevent the redefinition of struct fsxattr.
|
|
|
e59f31 |
|
|
|
e59f31 |
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
|
e59f31 |
Reported-by: Jeffrey Bastian <jbastian@redhat.com>
|
|
|
e59f31 |
|
|
|
e59f31 |
---
|
|
|
e59f31 |
libxfs/xfs_fs.h | 8 ++------
|
|
|
e59f31 |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
e59f31 |
|
|
|
e59f31 |
|
|
|
e59f31 |
diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
|
|
|
e59f31 |
index b9622ba..1f17e1c 100644
|
|
|
e59f31 |
--- a/libxfs/xfs_fs.h
|
|
|
e59f31 |
+++ b/libxfs/xfs_fs.h
|
|
|
e59f31 |
@@ -542,12 +542,8 @@ typedef struct xfs_swapext
|
|
|
e59f31 |
#define XFS_IOC_ERROR_CLEARALL _IOW ('X', 117, struct xfs_error_injection)
|
|
|
e59f31 |
/* XFS_IOC_ATTRCTL_BY_HANDLE -- deprecated 118 */
|
|
|
e59f31 |
|
|
|
e59f31 |
-/* XFS_IOC_FREEZE -- FIFREEZE 119 */
|
|
|
e59f31 |
-/* XFS_IOC_THAW -- FITHAW 120 */
|
|
|
e59f31 |
-#ifndef FIFREEZE
|
|
|
e59f31 |
-#define XFS_IOC_FREEZE _IOWR('X', 119, int)
|
|
|
e59f31 |
-#define XFS_IOC_THAW _IOWR('X', 120, int)
|
|
|
e59f31 |
-#endif
|
|
|
e59f31 |
+#define XFS_IOC_FREEZE _IOWR('X', 119, int) /* aka FIFREEZE */
|
|
|
e59f31 |
+#define XFS_IOC_THAW _IOWR('X', 120, int) /* aka FITHAW */
|
|
|
e59f31 |
|
|
|
e59f31 |
#define XFS_IOC_FSSETDM_BY_HANDLE _IOW ('X', 121, struct xfs_fsop_setdm_handlereq)
|
|
|
e59f31 |
#define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
|
|
|
e59f31 |
|
|
|
e59f31 |
diff --git a/include/linux.h b/include/linux.h
|
|
|
e59f31 |
index cc0f70c..0c616f4 100644
|
|
|
e59f31 |
--- a/include/linux.h
|
|
|
e59f31 |
+++ b/include/linux.h
|
|
|
e59f31 |
@@ -32,6 +32,7 @@
|
|
|
e59f31 |
#include <stdio.h>
|
|
|
e59f31 |
#include <asm/types.h>
|
|
|
e59f31 |
#include <mntent.h>
|
|
|
e59f31 |
+#include <linux/fs.h> /* fsxattr defintion for new kernels */
|
|
|
e59f31 |
|
|
|
e59f31 |
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
|
|
|
e59f31 |
{
|