From 52502a85d622125cfc5b67ee0f141d958f8fce69 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 5 Feb 2013 19:24:44 -0500 Subject: [PATCH] --- yaml --- r: 349607 b: refs/heads/master c: 24f8ebe9189c91f1b3ecfaadd27ef0cb7c74907f h: refs/heads/master i: 349605: 11800acce12750b74ce0ace6180949a14a1758a9 349603: fefd6fa29426e8f9c86cef09c5bbf3b9782aa1d2 349599: 37ba11399c6a415cb94800bb807a3603fa2519e7 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/volumes.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f50d28abfa6..cb15463de027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59fe4f41976f6331b695ff049296d082cf621823 +refs/heads/master: 24f8ebe9189c91f1b3ecfaadd27ef0cb7c74907f diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index 15f6efdf6463..5cbb7f4b1672 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -1556,7 +1556,8 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) ret = 0; /* Notify udev that device has changed */ - btrfs_kobject_uevent(bdev, KOBJ_CHANGE); + if (bdev) + btrfs_kobject_uevent(bdev, KOBJ_CHANGE); error_brelse: brelse(bh);