diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 17:06:39 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 17:06:39 +1200 |
| commit | 480082968a78151e731ebd304eeb6cada61a1cd1 (patch) | |
| tree | 263179c267b99763cb4fd952b24870cca28d14a7 /fs/xfs/xfs_linux.h | |
| parent | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (diff) | |
| parent | 0030807c66f058230bcb20d2573bcaf28852e804 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: revert to using a kthread for AIL pushing
xfs: force the log if we encounter pinned buffers in .iop_pushbuf
xfs: do not update xa_last_pushed_lsn for locked items
Diffstat (limited to 'fs/xfs/xfs_linux.h')
| -rw-r--r-- | fs/xfs/xfs_linux.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 1e8a45e74c3..828662f70d6 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -68,6 +68,8 @@ #include <linux/ctype.h> #include <linux/writeback.h> #include <linux/capability.h> +#include <linux/kthread.h> +#include <linux/freezer.h> #include <linux/list_sort.h> #include <asm/page.h> |