summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_dfrag.h
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-30 00:01:54 +0400
committerDave Jones <davej@redhat.com>2006-06-30 00:01:54 +0400
commit55b4d6a52195a8f277ffddf755ddaff359878f41 (patch)
tree06a3183a562f8da4688f65023f7a18dcad702956 /fs/xfs/xfs_dfrag.h
parentadf8a287150667feb5747f8beade62acacc17d4e (diff)
parent1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff)
downloadlinux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz
Merge ../linus
Conflicts: drivers/char/agp/Kconfig
Diffstat (limited to 'fs/xfs/xfs_dfrag.h')
-rw-r--r--fs/xfs/xfs_dfrag.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/xfs_dfrag.h b/fs/xfs/xfs_dfrag.h
index f678559abc45..da178205be68 100644
--- a/fs/xfs/xfs_dfrag.h
+++ b/fs/xfs/xfs_dfrag.h
@@ -48,6 +48,9 @@ typedef struct xfs_swapext
*/
int xfs_swapext(struct xfs_swapext __user *sx);
+int xfs_swap_extents(struct xfs_inode *ip, struct xfs_inode *tip,
+ struct xfs_swapext *sxp);
+
#endif /* __KERNEL__ */
#endif /* __XFS_DFRAG_H__ */