diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-02 03:05:22 -0500 |
| commit | fb7899b1f0b748ef966071f5dc23c59ebd57d08f (patch) | |
| tree | 2f13f9d8607871a60334608524e8b4e9447f5309 /fs/btrfs/disk-io.c | |
| parent | 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 (diff) | |
| parent | abe94c756c08d50566c09a65b9c7fe72f83071c5 (diff) | |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 009e3bd18f23..87b25543d7d1 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -1993,6 +1993,12 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
| 1993 | if (!fs_info->fs_root) | 1993 | if (!fs_info->fs_root) |
| 1994 | goto fail_trans_kthread; | 1994 | goto fail_trans_kthread; |
| 1995 | 1995 | ||
| 1996 | if (!(sb->s_flags & MS_RDONLY)) { | ||
| 1997 | down_read(&fs_info->cleanup_work_sem); | ||
| 1998 | btrfs_orphan_cleanup(fs_info->fs_root); | ||
| 1999 | up_read(&fs_info->cleanup_work_sem); | ||
| 2000 | } | ||
| 2001 | |||
| 1996 | return tree_root; | 2002 | return tree_root; |
| 1997 | 2003 | ||
| 1998 | fail_trans_kthread: | 2004 | fail_trans_kthread: |