Skip to contentSkip to conversation

btrfs: avoid passing int param to start_transaction which takes u64

PATCH In review Alexandru Moise 2 participants 4 messages Sep 13, 2015 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 btrfs: avoid passing int param to start_transaction which takes u64

---
 fs/btrfs/transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/transaction.c +1 -1
index 8f259b3..8a83acd 100644
@@ -570,7 +570,7 @@ reserve_fail:
 }
 
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
-						   int num_items)
+						   u64 num_items)
 {
 	return start_transaction(root, num_items, TRANS_START,
 				 BTRFS_RESERVE_FLUSH_ALL);
Signature · 1 line
2.5.1
#1 lore raw
Quoted 10 lines · Alexandru Moise
---
 fs/btrfs/transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/transaction.c +0 -0
index 8f259b3..8a83acd 100644

fs/btrfs/transaction.c reserve_fail: · line 576

Quoted 8 lines
fs/btrfs/transaction.c +1 -1
@@ -570,7 +570,7 @@ reserve_fail:
 }
 
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
-						   int num_items)
+						   u64 num_items)
 {
 	return start_transaction(root, num_items, TRANS_START,
 				 BTRFS_RESERVE_FLUSH_ALL);

So I tried to build this..you won't believe what happened next:

CC [M] fs/btrfs/transaction.o
fs/btrfs/transaction.c:570:28: error: conflicting types for 'btrfs_start_transaction'
struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,

                            ^
In file included from fs/btrfs/transaction.c:28:0:
fs/btrfs/transaction.h:186:28: note: previous declaration of 'btrfs_start_transaction' was here
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
                            ^

scripts/Makefile.build:258: recipe for target 'fs/btrfs/transaction.o' failed

You need to update transaction.h as well.

-h

#2 lore raw
Quoted 26 lines · Holger Hoffstätte
Quoted 10 lines · Alexandru Moise
---
 fs/btrfs/transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/transaction.c +0 -0
index 8f259b3..8a83acd 100644

fs/btrfs/transaction.c reserve_fail: · line 576

Quoted 8 lines
fs/btrfs/transaction.c +1 -1
@@ -570,7 +570,7 @@ reserve_fail:
 }
 
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
-						   int num_items)
+						   u64 num_items)
 {
 	return start_transaction(root, num_items, TRANS_START,
 				 BTRFS_RESERVE_FLUSH_ALL);

So I tried to build this..you won't believe what happened next:

CC [M] fs/btrfs/transaction.o
fs/btrfs/transaction.c:570:28: error: conflicting types for 'btrfs_start_transaction'
struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,

Quoted 8 lines
                            ^
In file included from fs/btrfs/transaction.c:28:0:
fs/btrfs/transaction.h:186:28: note: previous declaration of 'btrfs_start_transaction' was here
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
                            ^

scripts/Makefile.build:258: recipe for target 'fs/btrfs/transaction.o' failed

You need to update transaction.h as well.

The heck? I pulled from linus' tree earlier today and it built, I'll check again. Thanks for telling me.

#3 lore raw
In reply to Holger Hoffstätte
Quoted 26 lines · Holger Hoffstätte
Quoted 10 lines · Alexandru Moise
---
 fs/btrfs/transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/transaction.c +0 -0
index 8f259b3..8a83acd 100644

fs/btrfs/transaction.c reserve_fail: · line 576

Quoted 8 lines
fs/btrfs/transaction.c +1 -1
@@ -570,7 +570,7 @@ reserve_fail:
 }
 
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
-						   int num_items)
+						   u64 num_items)
 {
 	return start_transaction(root, num_items, TRANS_START,
 				 BTRFS_RESERVE_FLUSH_ALL);

So I tried to build this..you won't believe what happened next:

CC [M] fs/btrfs/transaction.o
fs/btrfs/transaction.c:570:28: error: conflicting types for 'btrfs_start_transaction'
struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,

Quoted 8 lines
                            ^
In file included from fs/btrfs/transaction.c:28:0:
fs/btrfs/transaction.h:186:28: note: previous declaration of 'btrfs_start_transaction' was here
 struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
                            ^

scripts/Makefile.build:258: recipe for target 'fs/btrfs/transaction.o' failed

You need to update transaction.h as well.

Dammit, yes. I only added transaction.c when I commited. Serves me right. I am an idiot for not running git status after git commit. Thanks a lot for telling me.
Just sent an amended patch.