git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
btrfs
/
sysfs.c
diff --git
a/fs/btrfs/sysfs.c
b/fs/btrfs/sysfs.c
index
7869936
..
12e5355
100644
(file)
--- a/
fs/btrfs/sysfs.c
+++ b/
fs/btrfs/sysfs.c
@@
-614,7
+614,7
@@
int btrfs_kobj_rm_device(struct btrfs_fs_info *fs_info,
if (!fs_info->device_dir_kobj)
return -EINVAL;
- if (one_device) {
+ if (one_device
&& one_device->bdev
) {
disk = one_device->bdev->bd_part;
disk_kobj = &part_to_dev(disk)->kobj;