diff options
| author | Alex Elder <aelder@sgi.com> | 2011-10-17 15:42:02 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-17 15:42:02 -0500 |
| commit | 9508534c5f170ada5a745cde0df49732718440e9 (patch) | |
| tree | 2b0f1e19aa529e77720522d13541adedbc46564e /fs/xfs/xfs_trans_priv.h | |
| parent | 5a93a064d27b42e4af1772b0599b53e3241191ac (diff) | |
| parent | a84a79e4d369a73c0130b5858199e949432da4c6 (diff) | |
| download | op-kernel-dev-9508534c5f170ada5a745cde0df49732718440e9.zip op-kernel-dev-9508534c5f170ada5a745cde0df49732718440e9.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Resolved conflicts:
fs/xfs/xfs_trans_priv.h:
- deleted struct xfs_ail field xa_flags
- kept field xa_log_flush in struct xfs_ail
fs/xfs/xfs_trans_ail.c:
- in xfsaild_push(), in XFS_ITEM_PUSHBUF case, replaced
"flush_log = 1" with "ailp->xa_log_flush++"
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_trans_priv.h')
| -rw-r--r-- | fs/xfs/xfs_trans_priv.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h index 0a6eec6..44820b9 100644 --- a/fs/xfs/xfs_trans_priv.h +++ b/fs/xfs/xfs_trans_priv.h @@ -64,24 +64,18 @@ struct xfs_ail_cursor { */ struct xfs_ail { struct xfs_mount *xa_mount; + struct task_struct *xa_task; struct list_head xa_ail; xfs_lsn_t xa_target; struct list_head xa_cursors; spinlock_t xa_lock; - struct delayed_work xa_work; xfs_lsn_t xa_last_pushed_lsn; - unsigned long xa_flags; int xa_log_flush; }; -#define XFS_AIL_PUSHING_BIT 0 - /* * From xfs_trans_ail.c */ - -extern struct workqueue_struct *xfs_ail_wq; /* AIL workqueue */ - void xfs_trans_ail_update_bulk(struct xfs_ail *ailp, struct xfs_ail_cursor *cur, struct xfs_log_item **log_items, int nr_items, |
