[1/2] btrfs: avoid passing int param to start_transaction which takes u64
diff mbox

Message ID 20150913142941.GA7154@gmail.com
State New
Headers show

Commit Message

Alexandru Moise Sept. 13, 2015, 2:29 p.m. UTC
Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com>
---
 fs/btrfs/transaction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexandru Moise Sept. 13, 2015, 6:34 p.m. UTC | #1
On Sun, Sep 13, 2015 at 02:53:14PM +0000, Holger Hoffstätte wrote:
> On Sun, 13 Sep 2015 14:29:41 +0000, Alexandru Moise wrote:
> 
> > Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com>
> > ---
> >  fs/btrfs/transaction.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> > index 8f259b3..8a83acd 100644
> > --- a/fs/btrfs/transaction.c
> > +++ b/fs/btrfs/transaction.c
> > @@ -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.

The heck? I pulled from linus' tree earlier today and it built, I'll check again.
Thanks for telling me.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexandru Moise Sept. 13, 2015, 6:50 p.m. UTC | #2
On Sun, Sep 13, 2015 at 02:53:14PM +0000, Holger Hoffstätte wrote:
> On Sun, 13 Sep 2015 14:29:41 +0000, Alexandru Moise wrote:
> 
> > Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com>
> > ---
> >  fs/btrfs/transaction.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> > index 8f259b3..8a83acd 100644
> > --- a/fs/btrfs/transaction.c
> > +++ b/fs/btrfs/transaction.c
> > @@ -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.

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 8f259b3..8a83acd 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -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);