diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 00:54:47 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-07-27 00:54:47 -0700 | 
| commit | aa7eb8e78d8ecd6cd0475d86ea8385ff9cb47ece (patch) | |
| tree | 3f9e98fadd5124fb05e8f6f9b06aa23698d4f215 /fs/xfs/xfs_ag.h | |
| parent | cca8edfd2ec2a34d9f50f593bc753bb11e1bc1f5 (diff) | |
| parent | 3c6b50141ef9f0a8844bf1357b80c0cdf518bf05 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/xfs/xfs_ag.h')
| -rw-r--r-- | fs/xfs/xfs_ag.h | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h index 58632cc17f2..6530769a999 100644 --- a/fs/xfs/xfs_ag.h +++ b/fs/xfs/xfs_ag.h @@ -187,7 +187,9 @@ struct xfs_busy_extent {  	xfs_agnumber_t	agno;  	xfs_agblock_t	bno;  	xfs_extlen_t	length; -	xlog_tid_t	tid;		/* transaction that created this */ +	unsigned int	flags; +#define XFS_ALLOC_BUSY_DISCARDED	0x01	/* undergoing a discard op. */ +#define XFS_ALLOC_BUSY_SKIP_DISCARD	0x02	/* do not discard */  };  /* | 
