diff options
| author |   Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
| commit | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (patch) | |
| tree | 3a97a48d6f282f9e06c5446beeb886fcd86c4798 /fs/btrfs/extent_io.c | |
| parent | Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration (diff) | |
| parent | Btrfs: make sure we're not using obsolete code in btrfs_get_extent (diff) | |
| download | linux-dev-9785dbdf265ddc47d5c88267d89a97648c0dc14b.tar.xz linux-dev-9785dbdf265ddc47d5c88267d89a97648c0dc14b.zip | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 49f3c9dc09f4..3622cc22ff91 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3579,6 +3579,7 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree, atomic_set(&eb->blocking_writers, 0); atomic_set(&eb->spinning_readers, 0); atomic_set(&eb->spinning_writers, 0); + eb->lock_nested = 0; init_waitqueue_head(&eb->write_lock_wq); init_waitqueue_head(&eb->read_lock_wq); |