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

Commit 050e714e authored by David Chinner's avatar David Chinner Committed by Tim Shimmin
Browse files

[XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h 



SGI-PV: 957005
SGI-Modid: xfs-linux-melb:xfs-kern:27398a

Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarMichal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 4c60658e

fs/xfs/linux-2.6/xfs_dmapi_priv.h

0 → 100644
+28 −0
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/xfs_dmapi.h

+2 −20
Original line number Diff line number Diff line
@@ -157,27 +157,9 @@ typedef enum { 
#define DM_FLAGS_IALLOCSEM_WR	0x020	/* thread holds i_alloc_sem wr */



/*

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

 *	Pull in platform specific event flags defines

 */

#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)

#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



#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && \

    (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22))

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

			      DM_FLAGS_IALLOCSEM_RD : DM_FLAGS_IMUX)

#define DM_SEM_FLAG_WR	(DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX)

#endif



#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,21)

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

			      0 : DM_FLAGS_IMUX)

#define DM_SEM_FLAG_WR	(DM_FLAGS_IMUX)

#endif



#include "xfs_dmapi_priv.h"



/*

 *	Macros to turn caller specified delay/block flags into