diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 12:23:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 12:23:07 -0400 |
| commit | 3a3527b6461b1298cc53ce72f336346739297ac8 (patch) | |
| tree | 30bea5dd7163f13d6c962888feaf53f50ead4cce /fs/partitions | |
| parent | cc77b4db0017dab014ad7ea3d297e10f5b5bf028 (diff) | |
| parent | a53f4b61a76a7e95139b8e8abba02e9bfe87a58a (diff) | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
Revert "net: Make accesses to ->br_port safe for sparse RCU"
mce: convert to rcu_dereference_index_check()
net: Make accesses to ->br_port safe for sparse RCU
vfs: add fs.h to define struct file
lockdep: Add an in_workqueue_context() lockdep-based test function
rcu: add __rcu API for later sparse checking
rcu: add an rcu_dereference_index_check()
tree/tiny rcu: Add debug RCU head objects
mm: remove all rcu head initializations
fs: remove all rcu head initializations, except on_stack initializations
powerpc: remove all rcu head initializations
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/check.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 5dcd4b0c5533..72c52656dc2e 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
| @@ -459,7 +459,6 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, | |||
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | /* everything is up and running, commence */ | 461 | /* everything is up and running, commence */ |
| 462 | INIT_RCU_HEAD(&p->rcu_head); | ||
| 463 | rcu_assign_pointer(ptbl->part[partno], p); | 462 | rcu_assign_pointer(ptbl->part[partno], p); |
| 464 | 463 | ||
| 465 | /* suppress uevent if the disk supresses it */ | 464 | /* suppress uevent if the disk supresses it */ |