diff options
| author | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
|---|---|---|
| committer | Niv Sardi <xaiki@debian.org> | 2008-11-06 23:07:12 -0500 |
| commit | dcd7b4e5c0649b1d2219399529b20de1df517e55 (patch) | |
| tree | ef00739e48ddda0a30061d62a7348ed4b0c9aeeb /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
| parent | 91b777125175077fb74025608dba87f100586c62 (diff) | |
Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index cc0f7b3a9795..77d6ddcaf547 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h | |||
| @@ -77,6 +77,7 @@ | |||
| 77 | #include <linux/spinlock.h> | 77 | #include <linux/spinlock.h> |
| 78 | #include <linux/random.h> | 78 | #include <linux/random.h> |
| 79 | #include <linux/ctype.h> | 79 | #include <linux/ctype.h> |
| 80 | #include <linux/writeback.h> | ||
| 80 | 81 | ||
| 81 | #include <asm/page.h> | 82 | #include <asm/page.h> |
| 82 | #include <asm/div64.h> | 83 | #include <asm/div64.h> |
| @@ -107,7 +108,6 @@ | |||
| 107 | #undef HAVE_PERCPU_SB /* per cpu superblock counters are a 2.6 feature */ | 108 | #undef HAVE_PERCPU_SB /* per cpu superblock counters are a 2.6 feature */ |
| 108 | #endif | 109 | #endif |
| 109 | 110 | ||
| 110 | #define restricted_chown xfs_params.restrict_chown.val | ||
| 111 | #define irix_sgid_inherit xfs_params.sgid_inherit.val | 111 | #define irix_sgid_inherit xfs_params.sgid_inherit.val |
| 112 | #define irix_symlink_mode xfs_params.symlink_mode.val | 112 | #define irix_symlink_mode xfs_params.symlink_mode.val |
| 113 | #define xfs_panic_mask xfs_params.panic_mask.val | 113 | #define xfs_panic_mask xfs_params.panic_mask.val |