linux.git/fs/btrfs, branch v3.2-rc2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2011-11-12T01:47:06+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: rename the option to nospace_cache
  Btrfs: handle bio_add_page failure gracefully in scrub
  Btrfs: fix deadlock caused by the race between relocation
  Btrfs: only map pages if we know we need them when reading the space cache
  Btrfs: fix orphan backref nodes
  Btrfs: Abstract similar code for btrfs_block_rsv_add{, _noflush}
  Btrfs: fix unreleased path in btrfs_orphan_cleanup()
  Btrfs: fix no reserved space for writing out inode cache
  Btrfs: fix nocow when deleting the item
  Btrfs: tweak the delayed inode reservations again
  Btrfs: rework error handling in btrfs_mount()
  Btrfs: close devices on all error paths in open_ctree()
  Btrfs: avoid null dereference and leaks when bailing from open_ctree()
  Btrfs: fix subvol_name leak on error in btrfs_mount()
  Btrfs: fix memory leak in btrfs_parse_early_options()
  Btrfs: fix our reservations for updating an inode when completing io
  Btrfs: fix oops on NULL trans handle in btrfs_truncate
  btrfs: fix double-free 'tree_root' in 'btrfs_mount()'

btrfs: rename the option to nospace_cache

2011-11-11T15:14:57+00:00

Rename no_space_cache option to nospace_cache to be more consistent with
the rest, where the simple prefix 'no' is used to negate an option.

The option has been introduced during the -rc1 cycle and there are has not been
widely used, so it's safe.

Signed-off-by: David Sterba 
Signed-off-by: Chris Mason

Btrfs: handle bio_add_page failure gracefully in scrub

2011-11-11T13:17:10+00:00

Currently scrub fails with ENOMEM when bio_add_page fails. Unfortunately
dm based targets accept only one page per bio, thus making scrub always
fails. This patch just submits the current bio when an error is encountered
and starts a new one.

Signed-off-by: Arne Jansen 
Signed-off-by: Chris Mason

Btrfs: fix deadlock caused by the race between relocation

2011-11-11T01:45:05+00:00

We can not do flushable reservation for the relocation when we create snapshot,
because it may make the transaction commit task and the flush task wait for
each other and the deadlock happens.

Signed-off-by: Miao Xie 
Signed-off-by: Chris Mason

Btrfs: only map pages if we know we need them when reading the space cache

2011-11-11T01:45:05+00:00

People have been running into a warning when loading space cache because the
page is already mapped when trying to read in a bitmap.  The way we read in
entries and pages is kind of convoluted, so fix it so that io_ctl_read_entry
maps the entries if it needs to, and if it hits the end of the page it simply
unmaps the page.  That way we can unconditionally unmap the io_ctl before
reading in the bitmap and we should stop hitting these warnings.  Thanks,

Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason

Btrfs: fix orphan backref nodes

2011-11-11T01:45:05+00:00

If the root node of a fs/file tree is in the block group that is
being relocated, but the others are not in the other block groups.
when we create a snapshot for this tree between the relocation tree
creation ends and ->create_reloc_tree is set to 0, Btrfs will create
some backref nodes that are the lowest nodes of the backrefs cache.
But we forget to add them into ->leaves list of the backref cache
and deal with them, and at last, they will triggered BUG_ON().

  kernel BUG at fs/btrfs/relocation.c:239!

This patch fixes it by adding them into ->leaves list of backref cache.

Signed-off-by: Miao Xie 
Signed-off-by: Chris Mason

Btrfs: Abstract similar code for btrfs_block_rsv_add{, _noflush}

2011-11-11T01:45:05+00:00

btrfs_block_rsv_add{, _noflush}() have similar code, so abstract that code.

Signed-off-by: Miao Xie 
Signed-off-by: Chris Mason

Btrfs: fix unreleased path in btrfs_orphan_cleanup()

2011-11-11T01:45:05+00:00

When we did stress test for the space relocation, the deadlock happened.
By debugging, We found it was caused by the carelessness that we forgot
to unlock the read lock of the extent buffers in btrfs_orphan_cleanup()
before we end the transaction handle, so the transaction commit task waited
the task, which called btrfs_orphan_cleanup(), to unlock the extent buffer,
but that task waited the commit task to end the transaction commit, and
the deadlock happened. Fix it.

Signed-ff-by: Miao Xie 

Signed-off-by: Chris Mason

Btrfs: fix no reserved space for writing out inode cache

2011-11-11T01:45:04+00:00

I-node cache forgets to reserve the space when writing out it. And when
we do some stress test, such as synctest, it will trigger WARN_ON() in
use_block_rsv().

WARNING: at fs/btrfs/extent-tree.c:5718 btrfs_alloc_free_block+0xbf/0x281 [btrfs]()
...
Call Trace:
 [] warn_slowpath_common+0x80/0x98
 [] warn_slowpath_null+0x15/0x17
 [] btrfs_alloc_free_block+0xbf/0x281 [btrfs]
 [] ? __set_page_dirty_nobuffers+0xfe/0x108
 [] __btrfs_cow_block+0x118/0x3b5 [btrfs]
 [] btrfs_cow_block+0x103/0x14e [btrfs]
 [] btrfs_search_slot+0x249/0x6a4 [btrfs]
 [] btrfs_lookup_inode+0x2a/0x8a [btrfs]
 [] btrfs_update_inode+0xaa/0x141 [btrfs]
 [] btrfs_save_ino_cache+0xea/0x202 [btrfs]
 [] ? btrfs_update_reloc_root+0x17e/0x197 [btrfs]
 [] commit_fs_roots+0xaa/0x158 [btrfs]
 [] btrfs_commit_transaction+0x405/0x731 [btrfs]
 [] ? wake_up_bit+0x25/0x25
 [] ? btrfs_log_dentry_safe+0x43/0x51 [btrfs]
 [] btrfs_sync_file+0x16a/0x198 [btrfs]
 [] ? mntput+0x21/0x23
 [] vfs_fsync_range+0x18/0x21
 [] vfs_fsync+0x17/0x19
 [] do_fsync+0x29/0x3e
 [] sys_fsync+0xb/0xf
 [] system_call_fastpath+0x16/0x1b

Sometimes it causes BUG_ON() in the reservation code of the delayed inode
is triggered.

So we must reserve enough space for inode cache.

Note: If we can not reserve the enough space for inode cache, we will
give up writing out it.

Signed-off-by: Miao Xie 
Signed-off-by: Chris Mason

Btrfs: fix nocow when deleting the item

2011-11-11T01:45:04+00:00

btrfs_previous_item() just search the b+ tree, do not COW the nodes or leaves,
if we modify the result of it, the meta-data will be broken. fix it.

Signed-off-by: Miao Xie 
Signed-off-by: Chris Mason