diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:38 -0700 |
| commit | 163baa33552bb1c08b6bf109319505570658a8f3 (patch) | |
| tree | db130209cf27ec72ecd5a7121a3c91543badc8f3 /fs/btrfs/volumes.c | |
| parent | eb7073db1076777496495483854993165e14790f (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
| download | op-kernel-dev-163baa33552bb1c08b6bf109319505570658a8f3.zip op-kernel-dev-163baa33552bb1c08b6bf109319505570658a8f3.tar.gz | |
Merge 3.0-rc2 into tty-linus
This is needed to catch the tty patch revert in the 3.0-rc2 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c48214e..da541df 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -504,7 +504,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices) BUG_ON(!new_device); memcpy(new_device, device, sizeof(*new_device)); new_device->name = kstrdup(device->name, GFP_NOFS); - BUG_ON(!new_device->name); + BUG_ON(device->name && !new_device->name); new_device->bdev = NULL; new_device->writeable = 0; new_device->in_fs_metadata = 0; |
