diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /fs/partitions | |
parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/partitions')
-rw-r--r-- | fs/partitions/check.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 5198ada67398..6d720243f5f4 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
@@ -334,6 +334,7 @@ void delete_partition(struct gendisk *disk, int partno) | |||
334 | 334 | ||
335 | blk_free_devt(part_devt(part)); | 335 | blk_free_devt(part_devt(part)); |
336 | rcu_assign_pointer(ptbl->part[partno], NULL); | 336 | rcu_assign_pointer(ptbl->part[partno], NULL); |
337 | rcu_assign_pointer(ptbl->last_lookup, NULL); | ||
337 | kobject_put(part->holder_dir); | 338 | kobject_put(part->holder_dir); |
338 | device_del(part_to_dev(part)); | 339 | device_del(part_to_dev(part)); |
339 | 340 | ||