2010-06-28 11:19:22

by Dan Carpenter

Subject: [patch] btrfs: make code reachable in btrfs_insert_some_items()

The break was in front of the "nr = i" assignment so that was never hit.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 0d1d966..ceb8ad2 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -3453,8 +3453,8 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans,
for (i = 0; i < nr; i++) {
if (total_size + data_size[i] + sizeof(struct btrfs_item) >
BTRFS_LEAF_DATA_SIZE(root)) {
- break;
nr = i;
+ break;
}
total_data += data_size[i];
total_size += data_size[i] + sizeof(struct btrfs_item);

2010-06-29 00:56:04

by Miao Xie

Subject: Re: [patch] btrfs: make code reachable in btrfs_insert_some_items()

Hi,

on 2010-6-28 19:17, Dan Carpenter wrote:
> The break was in front of the "nr = i" assignment so that was never hit.

This bug has been fixed a month ago, and the patch has been merged into the
btrfs-unstable tree.

http://marc.info/?l=linux-btrfs&m=127434036913484&w=2

Thanks
Miao
>
> Signed-off-by: Dan Carpenter <[email protected]>
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 0d1d966..ceb8ad2 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -3453,8 +3453,8 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans,
> for (i = 0; i < nr; i++) {
> if (total_size + data_size[i] + sizeof(struct btrfs_item) >
> BTRFS_LEAF_DATA_SIZE(root)) {
> - break;
> nr = i;
> + break;
> }
> total_data += data_size[i];
> total_size += data_size[i] + sizeof(struct btrfs_item);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2010-06-29 01:04:17

by Chris Mason

Subject: Re: [patch] btrfs: make code reachable in btrfs_insert_some_items()

On Tue, Jun 29, 2010 at 08:57:54AM +0800, Miao Xie wrote:
> Hi,
>
> on 2010-6-28 19:17, Dan Carpenter wrote:
> > The break was in front of the "nr = i" assignment so that was never hit.
>
> This bug has been fixed a month ago, and the patch has been merged into the
> btrfs-unstable tree.

This was one that we took out to keep the pull request down to the
critical fixes. That function actually isn't called, I'll just remove
it.

-chris

>
> http://marc.info/?l=linux-btrfs&m=127434036913484&w=2
>
> Thanks
> Miao
> >
> > Signed-off-by: Dan Carpenter <[email protected]>
> >
> > diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> > index 0d1d966..ceb8ad2 100644
> > --- a/fs/btrfs/ctree.c
> > +++ b/fs/btrfs/ctree.c
> > @@ -3453,8 +3453,8 @@ int btrfs_insert_some_items(struct btrfs_trans_handle *trans,
> > for (i = 0; i < nr; i++) {
> > if (total_size + data_size[i] + sizeof(struct btrfs_item) >
> > BTRFS_LEAF_DATA_SIZE(root)) {
> > - break;
> > nr = i;
> > + break;
> > }
> > total_data += data_size[i];
> > total_size += data_size[i] + sizeof(struct btrfs_item);
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>