Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[XFS] Remove KERNEL_VERSION macros from xfs_dmapi.h
SGI-PV: 957005
SGI-Modid: xfs-linux-melb:xfs-kern:27398a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
authored by David Chinner and committed by Tim Shimmin 050e714e 4c60658e
+28
fs/xfs/linux-2.6/xfs_dmapi_priv.h
+28
fs/xfs/linux-2.6/xfs_dmapi_priv.h
···
1
+
/*
2
+
* Copyright (c) 2000-2006 Silicon Graphics, Inc.
3
+
* All Rights Reserved.
4
+
*
5
+
* This program is free software; you can redistribute it and/or
6
+
* modify it under the terms of the GNU General Public License as
7
+
* published by the Free Software Foundation.
8
+
*
9
+
* This program is distributed in the hope that it would be useful,
10
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+
* GNU General Public License for more details.
13
+
*
14
+
* You should have received a copy of the GNU General Public License
15
+
* along with this program; if not, write the Free Software Foundation,
16
+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
17
+
*/
18
+
#ifndef __XFS_DMAPI_PRIV_H__
19
+
#define __XFS_DMAPI_PRIV_H__
20
+
21
+
/*
22
+
* Based on IO_ISDIRECT, decide which i_ flag is set.
23
+
*/
24
+
#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \
25
+
DM_FLAGS_IMUX : 0)
26
+
#define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX)
27
+
28
+
#endif /*__XFS_DMAPI_PRIV_H__*/
+2
-20
fs/xfs/xfs_dmapi.h
+2
-20
fs/xfs/xfs_dmapi.h
···
157
157
#define DM_FLAGS_IALLOCSEM_WR 0x020 /* thread holds i_alloc_sem wr */
158
158
159
159
/*
160
-
* Based on IO_ISDIRECT, decide which i_ flag is set.
160
+
* Pull in platform specific event flags defines
161
161
*/
162
-
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
163
-
#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \
164
-
DM_FLAGS_IMUX : 0)
165
-
#define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX)
166
-
#endif
167
-
168
-
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && \
169
-
(LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22))
170
-
#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \
171
-
DM_FLAGS_IALLOCSEM_RD : DM_FLAGS_IMUX)
172
-
#define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX)
173
-
#endif
174
-
175
-
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,21)
176
-
#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \
177
-
0 : DM_FLAGS_IMUX)
178
-
#define DM_SEM_FLAG_WR (DM_FLAGS_IMUX)
179
-
#endif
180
-
162
+
#include "xfs_dmapi_priv.h"
181
163
182
164
/*
183
165
* Macros to turn caller specified delay/block flags into