It removes XFS specific ioctl interfaces and request codes
for freeze feature.
This patch has been supplied by David Chinner.
Signed-off-by: Dave Chinner <dgc@sgi.com>
Signed-off-by: Takashi Sato <t-sato@yk.jp.nec.com>
---
linux-2.6/xfs_ioctl.c | 15 ---------------
linux-2.6/xfs_ioctl32.c | 2 --
xfs_fs.h | 4 ++--
3 files changed, 2 insertions(+), 19 deletions(-)
diff -uprN -X /home/sho/pub/MC/freeze-set/dontdiff linux-2.6.26-rc2-bit/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.26-rc2-xf
s/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-2.6.26-rc2-bit/fs/xfs/linux-2.6/xfs_ioctl.c 2008-05-12 11:15:10.000000000 +0900
+++ linux-2.6.26-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl.c 2008-05-12 11:25:50.000000000 +0900
@@ -1233,21 +1233,6 @@ xfs_ioctl(
return -error;
}
- case XFS_IOC_FREEZE:
- if (!capable(CAP_SYS_ADMIN))
- return -EPERM;
-
- if (inode->i_sb->s_frozen == SB_UNFROZEN)
- freeze_bdev(inode->i_sb->s_bdev);
- return 0;
-
- case XFS_IOC_THAW:
- if (!capable(CAP_SYS_ADMIN))
- return -EPERM;
- if (inode->i_sb->s_frozen != SB_UNFROZEN)
- thaw_bdev(inode->i_sb->s_bdev, inode->i_sb);
- return 0;
-
case XFS_IOC_GOINGDOWN: {
__uint32_t in;
diff -uprN -X /home/sho/pub/MC/freeze-set/dontdiff linux-2.6.26-rc2-bit/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.26-rc2-
xfs/fs/xfs/linux-2.6/xfs_ioctl32.c
--- linux-2.6.26-rc2-bit/fs/xfs/linux-2.6/xfs_ioctl32.c 2008-05-12 11:15:10.000000000 +0900
+++ linux-2.6.26-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl32.c 2008-05-12 11:25:50.000000000 +0900
@@ -398,8 +398,6 @@ xfs_compat_ioctl(
case XFS_IOC_FSGROWFSDATA:
case XFS_IOC_FSGROWFSLOG:
case XFS_IOC_FSGROWFSRT:
- case XFS_IOC_FREEZE:
- case XFS_IOC_THAW:
case XFS_IOC_GOINGDOWN:
case XFS_IOC_ERROR_INJECTION:
case XFS_IOC_ERROR_CLEARALL:
diff -uprN -X /home/sho/pub/MC/freeze-set/dontdiff linux-2.6.26-rc2-bit/fs/xfs/xfs_fs.h linux-2.6.26-rc2-xfs/fs/xfs/xfs_
fs.h
--- linux-2.6.26-rc2-bit/fs/xfs/xfs_fs.h 2008-05-12 11:15:11.000000000 +0900
+++ ...
