diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 17:35:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 17:35:13 -0400 |
| commit | 3c1795cc4bd9d57281bebc314315b8afa217b9c7 (patch) | |
| tree | 97972fe4970e5074ec3944c7cd5179fb2bfe5b36 /fs/xfs/linux-2.6/xfs_aops.h | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
| parent | dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: remove xfs_flush_space
xfs: flush delayed allcoation blocks on ENOSPC in create
xfs: block callers of xfs_flush_inodes() correctly
xfs: make inode flush at ENOSPC synchronous
xfs: use xfs_sync_inodes() for device flushing
xfs: inform the xfsaild of the push target before sleeping
xfs: prevent unwritten extent conversion from blocking I/O completion
xfs: fix double free of inode
xfs: validate log feature fields correctly
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.h b/fs/xfs/linux-2.6/xfs_aops.h index 1dd528849755..221b3e66ceef 100644 --- a/fs/xfs/linux-2.6/xfs_aops.h +++ b/fs/xfs/linux-2.6/xfs_aops.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #define __XFS_AOPS_H__ | 19 | #define __XFS_AOPS_H__ |
| 20 | 20 | ||
| 21 | extern struct workqueue_struct *xfsdatad_workqueue; | 21 | extern struct workqueue_struct *xfsdatad_workqueue; |
| 22 | extern struct workqueue_struct *xfsconvertd_workqueue; | ||
| 22 | extern mempool_t *xfs_ioend_pool; | 23 | extern mempool_t *xfs_ioend_pool; |
| 23 | 24 | ||
| 24 | /* | 25 | /* |