From: Takashi Sato <t-sato@yk.jp.nec.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
"dm-devel@redhat.com" <dm-devel@redhat.com>,
"viro@ZenIV.linux.org.uk" <viro@ZenIV.linux.org.uk>,
"linux-ext4@vger.kernel.org" <linux-ext4@vger.kernel.org>,
"xfs@oss.sgi.com" <xfs@oss.sgi.com>,
Christoph Hellwig <hch@infradead.org>,
"axboe@kernel.dk" <axboe@kernel.dk>,
"mtk.manpages@googlemail.com" <mtk.manpages@googlemail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/3] Remove XFS specific ioctl interfaces for freeze feature
Date: Mon, 18 Aug 2008 21:28:27 +0900 [thread overview]
Message-ID: <20080818212827t-sato@mail.jp.nec.com> (raw)
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 linux-2.6.27-rc2.org/Documentation/dontdiff linux-2.6.27-rc2-freeze/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6
.27-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl.c
--- linux-2.6.27-rc2-freeze/fs/xfs/linux-2.6/xfs_ioctl.c 2008-08-07 08:58:45.000000000 +0900
+++ linux-2.6.27-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl.c 2008-08-07 09:01:53.000000000 +0900
@@ -1529,21 +1529,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 linux-2.6.27-rc2.org/Documentation/dontdiff linux-2.6.27-rc2-freeze/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2
.6.27-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl32.c
--- linux-2.6.27-rc2-freeze/fs/xfs/linux-2.6/xfs_ioctl32.c 2008-08-07 08:58:45.000000000 +0900
+++ linux-2.6.27-rc2-xfs/fs/xfs/linux-2.6/xfs_ioctl32.c 2008-08-07 09:01:53.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 linux-2.6.27-rc2.org/Documentation/dontdiff linux-2.6.27-rc2-freeze/fs/xfs/xfs_fs.h linux-2.6.27-rc2-xfs/f
s/xfs/xfs_fs.h
--- linux-2.6.27-rc2-freeze/fs/xfs/xfs_fs.h 2008-08-07 08:58:45.000000000 +0900
+++ linux-2.6.27-rc2-xfs/fs/xfs/xfs_fs.h 2008-08-07 09:01:53.000000000 +0900
@@ -477,8 +477,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)
next reply other threads:[~2008-08-18 12:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-18 12:28 Takashi Sato [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-08 11:53 [PATCH 2/3] Remove XFS specific ioctl interfaces for freeze feature Takashi Sato
2008-07-22 9:38 Takashi Sato
2008-06-30 12:23 Takashi Sato
2008-06-24 7:00 Takashi Sato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080818212827t-sato@mail.jp.nec.com \
--to=t-sato@yk.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=hch@infradead.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtk.manpages@googlemail.com \
--cc=viro@ZenIV.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).