zygo: fix merge confict in btrfs_start_transaction

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 076990afb207c5151bd91b76fd5efa4920bc2b2f..5c265764c9fccb641c72aa8f897472da2c013f8f 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -160,7 +160,7 @@ static inline void btrfs_set_inode_last_trans(struct btrfs_trans_handle *trans,
 int btrfs_end_transaction(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root);
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
-                                                  unsigned int num_items);
+                                                  int num_items);
 struct btrfs_trans_handle *btrfs_start_transaction_fallback_global_rsv(
                                        struct btrfs_root *root,
                                        unsigned int num_items,