From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaegeuk Kim Subject: Re: [PATCH v2] xfs: use generic FS_IOC_GOINGDOWN for ioctl Date: Thu, 8 Jan 2015 17:48:33 -0800 Message-ID: <20150109014833.GA80010@jaegeuk-mac02> References: <1420740661-72288-1-git-send-email-jaegeuk@kernel.org> <1420740661-72288-2-git-send-email-jaegeuk@kernel.org> <54AEE06C.90806@sandeen.net> <20150108201843.GA74570@jaegeuk-mac02> <54AEE98D.5010103@sandeen.net> <20150108205416.GE25000@dastard> <20150108211853.GB74570@jaegeuk-mac02> <20150108220412.GI25000@dastard> <20150108221630.GA76957@jaegeuk-mac02> <20150109014151.GB79749@jaegeuk-mac02> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org, Eric Sandeen , linux-kernel@vger.kernel.org, xfs@oss.sgi.com To: Dave Chinner Return-path: Received: from mail.kernel.org ([198.145.29.136]:48386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbbAIBsh (ORCPT ); Thu, 8 Jan 2015 20:48:37 -0500 Content-Disposition: inline In-Reply-To: <20150109014151.GB79749@jaegeuk-mac02> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Change log from v1: o remove the obsolete options. -- >8 -- This patch uses XFS_IOC_GOINGDOWN for a generic ioctl command, FS_IOC_GOINGDOWN. Cc: Dave Chinner Signed-off-by: Jaegeuk Kim --- fs/xfs/xfs_fs.h | 9 +-------- fs/xfs/xfs_fsops.c | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index 18dc721..a44f528 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h @@ -482,13 +482,6 @@ typedef struct xfs_swapext } xfs_swapext_t; /* - * Flags for going down operation - */ -#define XFS_FSOP_GOING_FLAGS_DEFAULT 0x0 /* going down */ -#define XFS_FSOP_GOING_FLAGS_LOGFLUSH 0x1 /* flush log but not data */ -#define XFS_FSOP_GOING_FLAGS_NOLOGFLUSH 0x2 /* don't flush log nor data */ - -/* * ioctl commands that are used by Linux filesystems */ #define XFS_IOC_GETXFLAGS FS_IOC_GETFLAGS @@ -555,7 +548,7 @@ typedef struct xfs_swapext #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) #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom) -#define XFS_IOC_GOINGDOWN _IOR ('X', 125, __uint32_t) +#define XFS_IOC_GOINGDOWN FS_IOC_GOINGDOWN /* XFS_IOC_GETFSUUID ---------- deprecated 140 */ diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index fdc6422..f403664 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c @@ -793,7 +793,7 @@ xfs_fs_goingdown( __uint32_t inflags) { switch (inflags) { - case XFS_FSOP_GOING_FLAGS_DEFAULT: { + case FS_GOING_DOWN_FULLSYNC: { struct super_block *sb = freeze_bdev(mp->m_super->s_bdev); if (sb && !IS_ERR(sb)) { @@ -803,10 +803,10 @@ xfs_fs_goingdown( break; } - case XFS_FSOP_GOING_FLAGS_LOGFLUSH: + case FS_GOING_DOWN_METASYNC: xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT); break; - case XFS_FSOP_GOING_FLAGS_NOLOGFLUSH: + case FS_GOING_DOWN_NOSYNC: xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT | SHUTDOWN_LOG_IO_ERROR); break; -- 2.1.1