Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / fs / xfs / xfs_trans.h

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index ba1660b502a504a25a59d94bbd15c5ce2e9ed8fc..4643070d7cae4b814a36b101ba0a88fcd0c6287e 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -220,10 +220,9 @@ void               xfs_trans_log_efi_extent(xfs_trans_t *,
 struct xfs_efd_log_item        *xfs_trans_get_efd(xfs_trans_t *,
                                  struct xfs_efi_log_item *,
                                  uint);
-void           xfs_trans_log_efd_extent(xfs_trans_t *,
-                                        struct xfs_efd_log_item *,
-                                        xfs_fsblock_t,
-                                        xfs_extlen_t);
+int            xfs_trans_free_extent(struct xfs_trans *,
+                                     struct xfs_efd_log_item *, xfs_fsblock_t,
+                                     xfs_extlen_t);
 int            xfs_trans_commit(struct xfs_trans *);
 int            __xfs_trans_roll(struct xfs_trans **, struct xfs_inode *, int *);
 int            xfs_trans_roll(struct xfs_trans **, struct xfs_inode *);