diff options
author | Takashi Sato <t-sato@yk.jp.nec.com> | 2009-01-09 19:41:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 19:54:42 -0500 |
commit | 8e961870bb9804110d5c8211d5d9d500451c4518 (patch) | |
tree | a2354082d3a0255f58cd4e097f662b8bdeedd490 /fs/xfs/linux-2.6 | |
parent | fcccf502540e3d752d33b2d8e976034dee81f9f7 (diff) |
filesystem freeze: remove XFS specific ioctl interfaces for freeze feature
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>
Cc: Dave Chinner <david@fromorbit.com>
Cc: <xfs-masters@oss.sgi.com>
Cc: <linux-ext4@vger.kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Alasdair G Kergon <agk@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.c | 15 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c index 67205f6198ba..e5be1e0be802 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.c +++ b/fs/xfs/linux-2.6/xfs_ioctl.c | |||
@@ -1546,21 +1546,6 @@ xfs_file_ioctl( | |||
1546 | return -error; | 1546 | return -error; |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | case XFS_IOC_FREEZE: | ||
1550 | if (!capable(CAP_SYS_ADMIN)) | ||
1551 | return -EPERM; | ||
1552 | |||
1553 | if (inode->i_sb->s_frozen == SB_UNFROZEN) | ||
1554 | freeze_bdev(inode->i_sb->s_bdev); | ||
1555 | return 0; | ||
1556 | |||
1557 | case XFS_IOC_THAW: | ||
1558 | if (!capable(CAP_SYS_ADMIN)) | ||
1559 | return -EPERM; | ||
1560 | if (inode->i_sb->s_frozen != SB_UNFROZEN) | ||
1561 | thaw_bdev(inode->i_sb->s_bdev, inode->i_sb); | ||
1562 | return 0; | ||
1563 | |||
1564 | case XFS_IOC_GOINGDOWN: { | 1549 | case XFS_IOC_GOINGDOWN: { |
1565 | __uint32_t in; | 1550 | __uint32_t in; |
1566 | 1551 | ||
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 0504cece9f66..50903ad3182e 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
@@ -632,8 +632,6 @@ xfs_file_compat_ioctl( | |||
632 | case XFS_IOC_SET_RESBLKS: | 632 | case XFS_IOC_SET_RESBLKS: |
633 | case XFS_IOC_GET_RESBLKS: | 633 | case XFS_IOC_GET_RESBLKS: |
634 | case XFS_IOC_FSGROWFSLOG: | 634 | case XFS_IOC_FSGROWFSLOG: |
635 | case XFS_IOC_FREEZE: | ||
636 | case XFS_IOC_THAW: | ||
637 | case XFS_IOC_GOINGDOWN: | 635 | case XFS_IOC_GOINGDOWN: |
638 | case XFS_IOC_ERROR_INJECTION: | 636 | case XFS_IOC_ERROR_INJECTION: |
639 | case XFS_IOC_ERROR_CLEARALL: | 637 | case XFS_IOC_ERROR_CLEARALL: |