zygo: fix merge confict in btrfs_start_transaction

(cherry picked from commit 649fb9323a5d400e97e700ee297ad22bcfde490e)

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index a20e8b5ed81ae8f150640b1e1c527f463a79ec79..bbaa4e87684da43c113c6397c033c8b1e1ce983e 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -185,7 +185,7 @@ static inline void btrfs_clear_skip_qgroup(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,