Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e961870 authored by Takashi Sato's avatar Takashi Sato Committed by Linus Torvalds
Browse files

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: default avatarDave Chinner <dgc@sgi.com>
Signed-off-by: default avatarTakashi 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fcccf502

fs/xfs/linux-2.6/xfs_ioctl.c

+0 −15
Original line number Diff line number Diff line
@@ -1546,21 +1546,6 @@ xfs_file_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;

fs/xfs/linux-2.6/xfs_ioctl32.c

+0 −2
Original line number Diff line number Diff line
@@ -632,8 +632,6 @@ xfs_file_compat_ioctl( 
	case XFS_IOC_SET_RESBLKS:

	case XFS_IOC_GET_RESBLKS:

	case XFS_IOC_FSGROWFSLOG:

	case XFS_IOC_FREEZE:

	case XFS_IOC_THAW:

	case XFS_IOC_GOINGDOWN:

	case XFS_IOC_ERROR_INJECTION:

	case XFS_IOC_ERROR_CLEARALL:

fs/xfs/xfs_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -465,8 +465,8 @@ typedef struct xfs_handle { 
#define XFS_IOC_ERROR_INJECTION	     _IOW ('X', 116, struct xfs_error_injection)

#define XFS_IOC_ERROR_CLEARALL	     _IOW ('X', 117, struct xfs_error_injection)

/*	XFS_IOC_ATTRCTL_BY_HANDLE -- deprecated 118	 */

#define XFS_IOC_FREEZE		     _IOWR('X', 119, int)

#define XFS_IOC_THAW		     _IOWR('X', 120, int)

/*	XFS_IOC_FREEZE		  -- FIFREEZE   119	 */

/*	XFS_IOC_THAW		  -- FITHAW     120	 */

#define XFS_IOC_FSSETDM_BY_HANDLE    _IOW ('X', 121, struct xfs_fsop_setdm_handlereq)

#define XFS_IOC_ATTRLIST_BY_HANDLE   _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)

#define XFS_IOC_ATTRMULTI_BY_HANDLE  _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)