Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286018
b: refs/heads/master
c: 6de1d09
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jan 9, 2012
1 parent ee002d8 commit 9f71410
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aea52e19dd2085617dd7d247afb76a90cf2ea40c
refs/heads/master: 6de1d09d9677dce7a04ef485d426821159ab7de9
13 changes: 4 additions & 9 deletions trunk/fs/btrfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,20 +733,15 @@ static int btrfs_test_super(struct super_block *s, void *data)
struct btrfs_root *test_root = data;
struct btrfs_root *root = btrfs_sb(s);

/*
* If this super block is going away, return false as it
* can't match as an existing super block.
*/
if (!atomic_read(&s->s_active))
return 0;
return root->fs_info->fs_devices == test_root->fs_info->fs_devices;
}

static int btrfs_set_super(struct super_block *s, void *data)
{
s->s_fs_info = data;

return set_anon_super(s, data);
int err = set_anon_super(s, data);
if (!err)
s->s_fs_info = data;
return err;
}

/*
Expand Down

0 comments on commit 9f71410

Please sign in to comment.