Commit 0342cbcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-rcu-for-linus' of... 

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:
  rcu: Fix wrong check in list_splice_init_rcu()
  net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
  sysctl,rcu: Convert call_rcu(free_head) to kfree
  vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
  vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
  ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
  ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
  security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
  security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
  ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
  block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
  scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
  audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
  security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
  md,rcu: Convert call_rcu(free_conf) to kfree_rcu()
parents 391d6276 7f708931

arch/ia64/sn/kernel/irq.c

+2 −12
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ static void sn_ack_irq(struct irq_data *data) 
	irq_move_irq(data);

}



static void sn_irq_info_free(struct rcu_head *head);



struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,

				       nasid_t nasid, int slice)

{
@@ -177,7 +175,7 @@ struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info, 
	spin_lock(&sn_irq_info_lock);

	list_replace_rcu(&sn_irq_info->list, &new_irq_info->list);

	spin_unlock(&sn_irq_info_lock);

	call_rcu(&sn_irq_info->rcu, sn_irq_info_free);

	kfree_rcu(sn_irq_info, rcu);





finish_up:
@@ -338,14 +336,6 @@ static void unregister_intr_pda(struct sn_irq_info *sn_irq_info) 
	rcu_read_unlock();

}



static void sn_irq_info_free(struct rcu_head *head)

{

	struct sn_irq_info *sn_irq_info;



	sn_irq_info = container_of(head, struct sn_irq_info, rcu);

	kfree(sn_irq_info);

}



void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)

{

	nasid_t nasid = sn_irq_info->irq_nasid;
@@ -399,7 +389,7 @@ void sn_irq_unfixup(struct pci_dev *pci_dev) 
	spin_unlock(&sn_irq_info_lock);

	if (list_empty(sn_irq_lh[sn_irq_info->irq_irq]))

		free_irq_vector(sn_irq_info->irq_irq);

	call_rcu(&sn_irq_info->rcu, sn_irq_info_free);

	kfree_rcu(sn_irq_info, rcu);

	pci_dev_put(pci_dev);



}

block/genhd.c

+1 −9
Original line number Diff line number Diff line
@@ -1018,14 +1018,6 @@ static const struct attribute_group *disk_attr_groups[] = { 
	NULL

};



static void disk_free_ptbl_rcu_cb(struct rcu_head *head)

{

	struct disk_part_tbl *ptbl =

		container_of(head, struct disk_part_tbl, rcu_head);



	kfree(ptbl);

}



/**

 * disk_replace_part_tbl - replace disk->part_tbl in RCU-safe way

 * @disk: disk to replace part_tbl for
@@ -1046,7 +1038,7 @@ static void disk_replace_part_tbl(struct gendisk *disk, 


	if (old_ptbl) {

		rcu_assign_pointer(old_ptbl->last_lookup, NULL);

		call_rcu(&old_ptbl->rcu_head, disk_free_ptbl_rcu_cb);

		kfree_rcu(old_ptbl, rcu_head);

	}

}

drivers/md/linear.c

+1 −7
Original line number Diff line number Diff line
@@ -213,12 +213,6 @@ static int linear_run (mddev_t *mddev) 
	return md_integrity_register(mddev);

}



static void free_conf(struct rcu_head *head)

{

	linear_conf_t *conf = container_of(head, linear_conf_t, rcu);

	kfree(conf);

}



static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev)

{

	/* Adding a drive to a linear array allows the array to grow.
@@ -247,7 +241,7 @@ static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev) 
	md_set_array_sectors(mddev, linear_size(mddev, 0, 0));

	set_capacity(mddev->gendisk, mddev->array_sectors);

	revalidate_disk(mddev->gendisk);

	call_rcu(&oldconf->rcu, free_conf);

	kfree_rcu(oldconf, rcu);

	return 0;

}

drivers/scsi/libfc/fc_rport.c

+1 −13
Original line number Diff line number Diff line
@@ -152,18 +152,6 @@ static struct fc_rport_priv *fc_rport_create(struct fc_lport *lport, 
	return rdata;

}



/**

 * fc_rport_free_rcu() - Free a remote port

 * @rcu: The rcu_head structure inside the remote port

 */

static void fc_rport_free_rcu(struct rcu_head *rcu)

{

	struct fc_rport_priv *rdata;



	rdata = container_of(rcu, struct fc_rport_priv, rcu);

	kfree(rdata);

}



/**

 * fc_rport_destroy() - Free a remote port after last reference is released

 * @kref: The remote port's kref
@@ -173,7 +161,7 @@ static void fc_rport_destroy(struct kref *kref) 
	struct fc_rport_priv *rdata;



	rdata = container_of(kref, struct fc_rport_priv, kref);

	call_rcu(&rdata->rcu, fc_rport_free_rcu);

	kfree_rcu(rdata, rcu);

}



/**

include/linux/rculist.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static inline void list_splice_init_rcu(struct list_head *list, 
	struct list_head *last = list->prev;

	struct list_head *at = head->next;



	if (list_empty(head))

	if (list_empty(list))

		return;



	/* "first" and "last" tracking list, so initialize it. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE