[PATCH] btrfs/ctree.c: remove the unnecessary 'return -1;' at the end of bin_search

2012-03-30 Thread Wang Sheng-Hui
The code path should not reach there. Remove it. Signed-off-by: Wang Sheng-Hui shh...@gmail.com --- fs/btrfs/ctree.c |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 0639a55..c1be2da 100644 --- a/fs/btrfs/ctree.c +++

[PATCH] Btrfs: fix that check_int_data mount option was ignored

2012-03-30 Thread Stefan Behrens
The bitfield member mount_opt was too small by one bit to hold the mount option that enabled to include data extents in the integrity checker. Since the same issue happened when the BTRFS_MOUNT_PANIC_ON_FATAL_ERROR option was added (git rebase silently merges so that the increase of the size of

[PATCH] Btrfs: don't count CRC or header errors twice while scrubbing

2012-03-30 Thread Stefan Behrens
Each CRC or header error was counted twice, this is now fixed. Signed-off-by: Stefan Behrens sbehr...@giantdisaster.de --- The patch is based on cmason/integration as of 3/30/2012. fs/btrfs/scrub.c | 15 --- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git

Re: btrfs bugs on statfs on ro device

2012-03-30 Thread Jan Engelhardt
On Friday 2012-03-30 17:13, Jan Engelhardt wrote: Attempting to run `df` on a read-only btrfs crashes the kernel: # losetup -r -o $[313344*512] /dev/loop4 wholedisk.img # mount -o ro /dev/loop4 /mnt device fsid 4ba1fa38-d62b-4940-9825-7e6cceb7fcc8 devid 1 transid 4333 /dev/loop4 # df

[RFC PATCH v2 09/21] dio: Convert direct_IO to use iov_iter

2012-03-30 Thread Dave Kleikamp
Change the direct_IO aop to take an iov_iter argument rather than an iovec. This will get passed down through most filesystems so that only the __blockdev_direct_IO helper need be aware of whether user or kernel memory is being passed to the function. Signed-off-by: Dave Kleikamp

[RFC PATCH v2 20/21] btrfs: add support for read_iter and write_iter

2012-03-30 Thread Dave Kleikamp
btrfs can use generic_file_read_iter(). Base btrfs_file_write_iter() on btrfs_file_aio_write(), then have the latter call the former. Signed-off-by: Dave Kleikamp dave.kleik...@oracle.com Cc: Zach Brown z...@zabbo.net Cc: Chris Mason chris.ma...@oracle.com Cc: linux-btrfs@vger.kernel.org ---

Re: kernel BUG at fs/btrfs/volumes.c:2733

2012-03-30 Thread Sander
Hello Ilya, Ilya Dryomov wrote (ao): I'm definitely intrested in reproducing it. Could you please umount this filesystem, capture the output of 'btrfs-debug-tree -d dev' and post it somewhere ? Will do. It is the / filesystem, so I'll need to reboot. I need this to confirm that

[GIT PULL] Btrfs fixes and features

2012-03-30 Thread Chris Mason
Hi everyone, This pull request is pretty big, picking up patches that have been under development for some time. I have it in two branches: # against 3.3 # git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus # merged with linus git as of this morning (conflict in

Re: btrfs-convert processing time

2012-03-30 Thread Olivier Bonvalet
Le 22/02/2012 17:55, Olivier Bonvalet a écrit : So, the btrfs-convert for the smaller drive is done... after near 5 days. Which stats can I give you ? It's a 340GB LVM block device, and btrfs filesystem df /backup/ say that : Data: total=225.97GB, used=181.94GB System: total=32.00MB,

Re: [GIT PULL] Btrfs fixes and features

2012-03-30 Thread Linus Torvalds
On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason chris.ma...@oracle.com wrote: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus This causes a new warning for me: fs/btrfs/extent_io.c: In function ‘repair_eb_io_failure’: fs/btrfs/extent_io.c:1940:6: warning: ‘ret’

Re: kernel BUG at fs/btrfs/volumes.c:2733

2012-03-30 Thread Ilya Dryomov
On Fri, Mar 30, 2012 at 07:49:56PM +0200, Sander wrote: Hello Ilya, Ilya Dryomov wrote (ao): I'm definitely intrested in reproducing it. Could you please umount this filesystem, capture the output of 'btrfs-debug-tree -d dev' and post it somewhere ? Will do. It is the /

Re: [GIT PULL] Btrfs fixes and features

2012-03-30 Thread Linus Torvalds
On Fri, Mar 30, 2012 at 12:50 PM, Linus Torvalds torva...@linux-foundation.org wrote: This causes a new warning for me:  fs/btrfs/extent_io.c: In function ‘repair_eb_io_failure’:  fs/btrfs/extent_io.c:1940:6: warning: ‘ret’ may be used uninitialized in this function Hmm? Ok, so presumably

Re: [GIT PULL] Btrfs fixes and features

2012-03-30 Thread Chris Mason
On Fri, Mar 30, 2012 at 12:50:26PM -0700, Linus Torvalds wrote: On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason chris.ma...@oracle.com wrote: git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus This causes a new warning for me: fs/btrfs/extent_io.c: In

Re: [GIT PULL] Btrfs fixes and features

2012-03-30 Thread Chris Mason
On Fri, Mar 30, 2012 at 12:54:03PM -0700, Linus Torvalds wrote: On Fri, Mar 30, 2012 at 12:50 PM, Linus Torvalds torva...@linux-foundation.org wrote: This causes a new warning for me:  fs/btrfs/extent_io.c: In function ‘repair_eb_io_failure’:  fs/btrfs/extent_io.c:1940:6: warning:

Re: [GIT PULL] Btrfs fixes and features

2012-03-30 Thread Alex
Chris Mason chris.mason at oracle.com writes: Hi everyone, This pull request is pretty big, picking up patches that have been under development for some time. I have it in two branches: Thank you all guys for your time, effort and responses here. No problems here so far ;-) -- To

Re: btrfsck integration with userlevel API for fsck

2012-03-30 Thread Avi Miller
On 30/03/2012, at 2:22 PM, Fajar A. Nugraha wrote: On Fri, Mar 30, 2012 at 5:08 AM, member graysky gray...@archlinux.us wrote: Are there plans to integrate btrfsck with the userlevel API for fsck? There isn't even a stable, working, fixing btrfsck yet :) Yes, there is. Chris merged the

Re: kernel BUG at fs/btrfs/volumes.c:2733

2012-03-30 Thread Sander
Ilya Dryomov wrote (ao): On Fri, Mar 30, 2012 at 07:49:56PM +0200, Sander wrote: Thanks. btrfs-debug-tree confirms that you've got a balance item on media. After that mount it back and see if there is btrfs: continuing balance line in dmesg (and if btrfs-balance kthread shows up)?

Re: btrfsck integration with userlevel API for fsck

2012-03-30 Thread Fajar A. Nugraha
On Sat, Mar 31, 2012 at 3:35 AM, Avi Miller avi.mil...@oracle.com wrote: On 30/03/2012, at 2:22 PM, Fajar A. Nugraha wrote: On Fri, Mar 30, 2012 at 5:08 AM, member graysky gray...@archlinux.us wrote: Are there plans to integrate btrfsck with the userlevel API for fsck? There isn't even a