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

Commit 288699fe authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: drop dmapi hooks 



Dmapi support was never merged upstream, but we still have a lot of hooks
bloating XFS for it, all over the fast pathes of the filesystem.

This patch drops over 700 lines of dmapi overhead.  If we'll ever get HSM
support in mainline at least the namespace events can be done much saner
in the VFS instead of the individual filesystem, so it's not like this
is much help for future work.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent b37fa16e

fs/xfs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ xfs-y += xfs_alloc.o \ 
				   xfs_trans_item.o \

				   xfs_utils.o \

				   xfs_vnodeops.o \

				   xfs_rw.o \

				   xfs_dmops.o

				   xfs_rw.o



xfs-$(CONFIG_XFS_TRACE)		+= xfs_btree_trace.o

fs/xfs/linux-2.6/xfs_aops.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "xfs_ag.h"

#include "xfs_dir2.h"

#include "xfs_trans.h"

#include "xfs_dmapi.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_alloc_btree.h"

fs/xfs/linux-2.6/xfs_buf.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "xfs_inum.h"

#include "xfs_log.h"

#include "xfs_ag.h"

#include "xfs_dmapi.h"

#include "xfs_mount.h"

#include "xfs_trace.h"

fs/xfs/linux-2.6/xfs_dmapi_priv.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2006 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#ifndef __XFS_DMAPI_PRIV_H__

#define __XFS_DMAPI_PRIV_H__



/*

 *	Based on IO_ISDIRECT, decide which i_ flag is set.

 */

#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \

			      DM_FLAGS_IMUX : 0)

#define DM_SEM_FLAG_WR	(DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX)



#endif /*__XFS_DMAPI_PRIV_H__*/

fs/xfs/linux-2.6/xfs_export.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_dir2.h"

#include "xfs_dmapi.h"

#include "xfs_mount.h"

#include "xfs_export.h"

#include "xfs_vnodeops.h"