diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
| commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
| tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /fs/xfs/linux-2.6/xfs_buf.h | |
| parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_buf.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h index 74deed8e6d90..3f8f69a66aea 100644 --- a/fs/xfs/linux-2.6/xfs_buf.h +++ b/fs/xfs/linux-2.6/xfs_buf.h | |||
| @@ -576,7 +576,6 @@ extern xfs_buftarg_t *xfs_alloc_buftarg(struct block_device *, int); | |||
| 576 | extern void xfs_free_buftarg(xfs_buftarg_t *, int); | 576 | extern void xfs_free_buftarg(xfs_buftarg_t *, int); |
| 577 | extern void xfs_wait_buftarg(xfs_buftarg_t *); | 577 | extern void xfs_wait_buftarg(xfs_buftarg_t *); |
| 578 | extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int); | 578 | extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int); |
| 579 | extern void xfs_incore_relse(xfs_buftarg_t *, int, int); | ||
| 580 | extern int xfs_flush_buftarg(xfs_buftarg_t *, int); | 579 | extern int xfs_flush_buftarg(xfs_buftarg_t *, int); |
| 581 | 580 | ||
| 582 | #define xfs_getsize_buftarg(buftarg) \ | 581 | #define xfs_getsize_buftarg(buftarg) \ |