From: Alexandru Moise <00moses.alexander00@gmail.com>
To: "Holger Hoffstätte" <holger.hoffstaette@googlemail.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] btrfs: avoid passing int param to start_transaction which takes u64
Date: Sun, 13 Sep 2015 18:50:57 +0000 [thread overview]
Message-ID: <20150913185057.GA28831@gmail.com> (raw)
In-Reply-To: <pan.2015.09.13.14.53.14@googlemail.com>
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.
next prev parent reply other threads:[~2015-09-13 15:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-13 14:29 [PATCH 1/2] btrfs: avoid passing int param to start_transaction which takes u64 Alexandru Moise
[not found] ` <pan.2015.09.13.14.53.14@googlemail.com>
2015-09-13 18:34 ` Alexandru Moise
2015-09-13 18:50 ` Alexandru Moise [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-09-13 18:47 Alexandru Moise
2015-09-22 13:09 ` David Sterba
2015-09-22 13:33 ` Alexandru Moise
2015-09-22 13:43 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150913185057.GA28831@gmail.com \
--to=00moses.alexander00@gmail.com \
--cc=holger.hoffstaette@googlemail.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).