diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /fs/xfs/xfs_trans.h | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Diffstat (limited to 'fs/xfs/xfs_trans.h')
| -rw-r--r-- | fs/xfs/xfs_trans.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index ca64f33c63a3..c93e3a102857 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h | |||
| @@ -861,8 +861,7 @@ typedef struct xfs_item_ops { | |||
| 861 | #define XFS_ITEM_SUCCESS 0 | 861 | #define XFS_ITEM_SUCCESS 0 |
| 862 | #define XFS_ITEM_PINNED 1 | 862 | #define XFS_ITEM_PINNED 1 |
| 863 | #define XFS_ITEM_LOCKED 2 | 863 | #define XFS_ITEM_LOCKED 2 |
| 864 | #define XFS_ITEM_FLUSHING 3 | 864 | #define XFS_ITEM_PUSHBUF 3 |
| 865 | #define XFS_ITEM_PUSHBUF 4 | ||
| 866 | 865 | ||
| 867 | /* | 866 | /* |
| 868 | * This structure is used to maintain a list of block ranges that have been | 867 | * This structure is used to maintain a list of block ranges that have been |