diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /fs/xfs/xfs_buf_item.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'fs/xfs/xfs_buf_item.h')
| -rw-r--r-- | fs/xfs/xfs_buf_item.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h index db6371087fe8..3f3455a41510 100644 --- a/fs/xfs/xfs_buf_item.h +++ b/fs/xfs/xfs_buf_item.h | |||
| @@ -71,10 +71,6 @@ void xfs_buf_attach_iodone(struct xfs_buf *, | |||
| 71 | void xfs_buf_iodone_callbacks(struct xfs_buf *); | 71 | void xfs_buf_iodone_callbacks(struct xfs_buf *); |
| 72 | void xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *); | 72 | void xfs_buf_iodone(struct xfs_buf *, struct xfs_log_item *); |
| 73 | 73 | ||
| 74 | void xfs_trans_buf_set_type(struct xfs_trans *, struct xfs_buf *, | ||
| 75 | enum xfs_blft); | ||
| 76 | void xfs_trans_buf_copy_type(struct xfs_buf *dst_bp, struct xfs_buf *src_bp); | ||
| 77 | |||
| 78 | extern kmem_zone_t *xfs_buf_item_zone; | 74 | extern kmem_zone_t *xfs_buf_item_zone; |
| 79 | 75 | ||
| 80 | #endif /* __XFS_BUF_ITEM_H__ */ | 76 | #endif /* __XFS_BUF_ITEM_H__ */ |