diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 1 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 1 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vfs.h | 44 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 3 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 10 |
5 files changed, 13 insertions, 46 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index a4b254eb43b2..6ce9c9c7cdde 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "xfs_bmap_btree.h" | 36 | #include "xfs_bmap_btree.h" |
37 | #include "xfs_attr_sf.h" | 37 | #include "xfs_attr_sf.h" |
38 | #include "xfs_dir2_sf.h" | 38 | #include "xfs_dir2_sf.h" |
39 | #include "xfs_vfs.h" | ||
40 | #include "xfs_vnode.h" | 39 | #include "xfs_vnode.h" |
41 | #include "xfs_dinode.h" | 40 | #include "xfs_dinode.h" |
42 | #include "xfs_inode.h" | 41 | #include "xfs_inode.h" |
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index cfe16a36a1da..507492d6dccd 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
@@ -80,7 +80,6 @@ | |||
80 | #include <asm/byteorder.h> | 80 | #include <asm/byteorder.h> |
81 | #include <asm/unaligned.h> | 81 | #include <asm/unaligned.h> |
82 | 82 | ||
83 | #include <xfs_vfs.h> | ||
84 | #include <xfs_cred.h> | 83 | #include <xfs_cred.h> |
85 | #include <xfs_vnode.h> | 84 | #include <xfs_vnode.h> |
86 | #include <xfs_stats.h> | 85 | #include <xfs_stats.h> |
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h deleted file mode 100644 index 8de5c4c95cb6..000000000000 --- a/fs/xfs/linux-2.6/xfs_vfs.h +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
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_VFS_H__ | ||
19 | #define __XFS_VFS_H__ | ||
20 | |||
21 | #include <linux/vfs.h> | ||
22 | #include "xfs_fs.h" | ||
23 | |||
24 | struct inode; | ||
25 | |||
26 | struct fid; | ||
27 | struct cred; | ||
28 | struct seq_file; | ||
29 | struct super_block; | ||
30 | struct xfs_inode; | ||
31 | struct xfs_mount; | ||
32 | struct xfs_mount_args; | ||
33 | |||
34 | #define SHUTDOWN_META_IO_ERROR 0x0001 /* write attempt to metadata failed */ | ||
35 | #define SHUTDOWN_LOG_IO_ERROR 0x0002 /* write attempt to the log failed */ | ||
36 | #define SHUTDOWN_FORCE_UMOUNT 0x0004 /* shutdown from a forced unmount */ | ||
37 | #define SHUTDOWN_CORRUPT_INCORE 0x0008 /* corrupt in-memory data structures */ | ||
38 | #define SHUTDOWN_REMOTE_REQ 0x0010 /* shutdown came from remote cell */ | ||
39 | #define SHUTDOWN_DEVICE_REQ 0x0020 /* failed all paths to the device */ | ||
40 | |||
41 | #define xfs_test_for_freeze(mp) ((mp)->m_super->s_frozen) | ||
42 | #define xfs_wait_for_freeze(mp,l) vfs_check_frozen((mp)->m_super, (l)) | ||
43 | |||
44 | #endif /* __XFS_VFS_H__ */ | ||
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index bf89e41c3b8d..fb49e0f42d31 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h | |||
@@ -18,7 +18,10 @@ | |||
18 | #ifndef __XFS_VNODE_H__ | 18 | #ifndef __XFS_VNODE_H__ |
19 | #define __XFS_VNODE_H__ | 19 | #define __XFS_VNODE_H__ |
20 | 20 | ||
21 | #include "xfs_fs.h" | ||
22 | |||
21 | struct file; | 23 | struct file; |
24 | struct xfs_inode; | ||
22 | struct xfs_iomap; | 25 | struct xfs_iomap; |
23 | struct attrlist_cursor_kern; | 26 | struct attrlist_cursor_kern; |
24 | 27 | ||
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index d70314302520..4fce22a8c355 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -428,6 +428,16 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname, | |||
428 | #define xfs_force_shutdown(m,f) \ | 428 | #define xfs_force_shutdown(m,f) \ |
429 | xfs_do_force_shutdown(m, f, __FILE__, __LINE__) | 429 | xfs_do_force_shutdown(m, f, __FILE__, __LINE__) |
430 | 430 | ||
431 | #define SHUTDOWN_META_IO_ERROR 0x0001 /* write attempt to metadata failed */ | ||
432 | #define SHUTDOWN_LOG_IO_ERROR 0x0002 /* write attempt to the log failed */ | ||
433 | #define SHUTDOWN_FORCE_UMOUNT 0x0004 /* shutdown from a forced unmount */ | ||
434 | #define SHUTDOWN_CORRUPT_INCORE 0x0008 /* corrupt in-memory data structures */ | ||
435 | #define SHUTDOWN_REMOTE_REQ 0x0010 /* shutdown came from remote cell */ | ||
436 | #define SHUTDOWN_DEVICE_REQ 0x0020 /* failed all paths to the device */ | ||
437 | |||
438 | #define xfs_test_for_freeze(mp) ((mp)->m_super->s_frozen) | ||
439 | #define xfs_wait_for_freeze(mp,l) vfs_check_frozen((mp)->m_super, (l)) | ||
440 | |||
431 | /* | 441 | /* |
432 | * Flags for xfs_mountfs | 442 | * Flags for xfs_mountfs |
433 | */ | 443 | */ |