diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-04-09 15:12:07 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-04-09 15:12:07 -0400 |
commit | dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7 (patch) | |
tree | 20b68d90d175eb9f07cf19b2e8be4011a8e8e6e5 /fs/xfs/xfs_mount.h | |
parent | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (diff) | |
parent | 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_mount.h')
-rw-r--r-- | fs/xfs/xfs_mount.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 7af44adffc8f..d6a64392f983 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -313,7 +313,7 @@ typedef struct xfs_mount { | |||
313 | #endif | 313 | #endif |
314 | struct xfs_mru_cache *m_filestream; /* per-mount filestream data */ | 314 | struct xfs_mru_cache *m_filestream; /* per-mount filestream data */ |
315 | struct task_struct *m_sync_task; /* generalised sync thread */ | 315 | struct task_struct *m_sync_task; /* generalised sync thread */ |
316 | bhv_vfs_sync_work_t m_sync_work; /* work item for VFS_SYNC */ | 316 | xfs_sync_work_t m_sync_work; /* work item for VFS_SYNC */ |
317 | struct list_head m_sync_list; /* sync thread work item list */ | 317 | struct list_head m_sync_list; /* sync thread work item list */ |
318 | spinlock_t m_sync_lock; /* work item list lock */ | 318 | spinlock_t m_sync_lock; /* work item list lock */ |
319 | int m_sync_seq; /* sync thread generation no. */ | 319 | int m_sync_seq; /* sync thread generation no. */ |