scrub fixes for -rc3

GIT PULL NAK Arne Jansen 3 participants 4 messages Jun 8, 2011 – Jun 9, 2011 Btrfs file system

lore

Share & tools

lore

Arne Jansen

author

2011-06-08 08:58 UTC #0 lore raw

Hi Chris,

please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne.git
for-chris

It contains the 2 commits

Arne Jansen (1):
btrfs: scrub: errors in tree enumeration

Li Zefan (1):
Btrfs: avoid stack bloat in btrfs_ioctl_fs_info()

It also reverts

commit cb25c2ea6a79702ab7895b873c6c43e0d3bc3c72

Author: Josef Bacik <[email protected]>
Date:   Wed May 11 12:17:34 2011 -0400

Btrfs: map the node block when looking for readahead targets

because it breaks readahead and with it scrub. This went unnoticed, because another commit disabled reada in many calling sites. Scrub is a heavy user of reada.

Thanks,
Arne

Josef Bacik

NAK

2011-06-08 13:25 UTC #1 lore raw

Quoted 18 lines · Arne Jansen

Hi Chris,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne.git
for-chris
It contains the 2 commits
Arne Jansen (1):
btrfs: scrub: errors in tree enumeration
Li Zefan (1):
Btrfs: avoid stack bloat in btrfs_ioctl_fs_info()
It also reverts
commit cb25c2ea6a79702ab7895b873c6c43e0d3bc3c72

Quoted 9 lines

Author: Josef Bacik <[email protected]>
Date:   Wed May 11 12:17:34 2011 -0400
Btrfs: map the node block when looking for readahead targets
because it breaks readahead and with it scrub. This went unnoticed, because another commit disabled reada in many calling sites. Scrub is a heavy user of reada.

NAK, this commit isn't wrong, something else is happening. Thanks,

Josef

Chris Mason

2011-06-08 17:54 UTC #2 lore raw

Excerpts from Josef Bacik's message of 2011-06-08 09:25:57 -0400:

Quoted 8 lines · Arne Jansen

Quoted 7 lines
Hi Chris,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne.git
for-chris

Quoted 7 lines

Quoted 7 lines
It contains the 2 commits
Arne Jansen (1):
btrfs: scrub: errors in tree enumeration
Li Zefan (1):
Btrfs: avoid stack bloat in btrfs_ioctl_fs_info()

Please leave off commits from others unless you somehow depend on them ;) I'll pull in the stack bloat patch separately.

re: the revert, it sounds like the lack of locking is causing trouble. We'll have to figure something else out.

-chris

Arne Jansen

author

2011-06-09 06:51 UTC #3 lore raw

Quoted 11 lines · Chris Mason

Excerpts from Josef Bacik's message of 2011-06-08 09:25:57 -0400:
Quoted 10 lines · Arne Jansen
Quoted 9 lines
Hi Chris,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne.git
for-chris
It contains the 2 commits

Quoted 8 lines

Quoted 5 lines
Quoted 5 lines
Arne Jansen (1):
btrfs: scrub: errors in tree enumeration
Li Zefan (1):
Btrfs: avoid stack bloat in btrfs_ioctl_fs_info()
Please leave off commits from others unless you somehow depend on them ;) I'll pull in the stack bloat patch separately.

ok, will not do it again ;)

Quoted 3 lines

re: the revert, it sounds like the lack of locking is causing trouble. We'll have to figure something else out.

Josef sent a patch for that. It fixes the crashes I saw, so please take it instead.

The branch is now updated to contain only the tree enumeration correction, now even more correct.

-Arne

Quoted 2 lines

-chris