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/xfs_dir_leaf.h | |
parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/xfs/xfs_dir_leaf.h')
-rw-r--r-- | fs/xfs/xfs_dir_leaf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dir_leaf.h b/fs/xfs/xfs_dir_leaf.h index 00d68d33cc7a..dd423ce1bc8d 100644 --- a/fs/xfs/xfs_dir_leaf.h +++ b/fs/xfs/xfs_dir_leaf.h | |||
@@ -202,8 +202,6 @@ int xfs_dir_leaf_to_shortform(struct xfs_da_args *args); | |||
202 | /* | 202 | /* |
203 | * Routines used for growing the Btree. | 203 | * Routines used for growing the Btree. |
204 | */ | 204 | */ |
205 | int xfs_dir_leaf_create(struct xfs_da_args *args, xfs_dablk_t which_block, | ||
206 | struct xfs_dabuf **bpp); | ||
207 | int xfs_dir_leaf_split(struct xfs_da_state *state, | 205 | int xfs_dir_leaf_split(struct xfs_da_state *state, |
208 | struct xfs_da_state_blk *oldblk, | 206 | struct xfs_da_state_blk *oldblk, |
209 | struct xfs_da_state_blk *newblk); | 207 | struct xfs_da_state_blk *newblk); |