[PATCH] xen-pcifront: don't use flush_scheduled_work()

[PATCH] xen-pcifront: don't use flush_scheduled_work()

[Tejun Heo]

flush_scheduled_work() is scheduled for deprecation.  Cancel ->op_work
directly instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ryan Wilson <hap9@epoch.ncsc.mil>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/pci/xen-pcifront.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: work/drivers/pci/xen-pcifront.c
===================================================================
--- work.orig/drivers/pci/xen-pcifront.c
+++ work/drivers/pci/xen-pcifront.c
@@ -733,8 +733,7 @@ static void free_pdev(struct pcifront_de
 
 	pcifront_free_roots(pdev);
 
-	/*For PCIE_AER error handling job*/
-	flush_scheduled_work();
+	cancel_work_sync(&pdev->op_work);
 
 	if (pdev->irq >= 0)
 		unbind_from_irqhandler(pdev->irq, pdev);

Re: [PATCH] xen-pcifront: don't use flush_scheduled_work()

[Konrad Rzeszutek Wilk]

On Mon, Jan 24, 2011 at 03:43:03PM +0100, Tejun Heo wrote:
> flush_scheduled_work() is scheduled for deprecation.  Cancel ->op_work

2.6.39 or 2.6.40? Not seeing it referenced in feature-removal-schedule.txt file?

> directly instead.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Ryan Wilson <hap9@epoch.ncsc.mil>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Jan Beulich <JBeulich@novell.com>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/pci/xen-pcifront.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> Index: work/drivers/pci/xen-pcifront.c
> ===================================================================
> --- work.orig/drivers/pci/xen-pcifront.c
> +++ work/drivers/pci/xen-pcifront.c
> @@ -733,8 +733,7 @@ static void free_pdev(struct pcifront_de
>  
>  	pcifront_free_roots(pdev);
>  
> -	/*For PCIE_AER error handling job*/

Any reason for getting rid of the comment?

> -	flush_scheduled_work();
> +	cancel_work_sync(&pdev->op_work);
>  
>  	if (pdev->irq >= 0)
>  		unbind_from_irqhandler(pdev->irq, pdev);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] xen-pcifront: don't use flush_scheduled_work()

[Tejun Heo]

Hello,

On Mon, Jan 24, 2011 at 10:39:58AM -0500, Konrad Rzeszutek Wilk wrote:
> On Mon, Jan 24, 2011 at 03:43:03PM +0100, Tejun Heo wrote:
> > flush_scheduled_work() is scheduled for deprecation.  Cancel ->op_work
> 
> 2.6.39 or 2.6.40? Not seeing it referenced in
> feature-removal-schedule.txt file?

There now are only a handful of users left.  I'm currently sending out
patches for them.  Once they appear on linux-next, I'll mark
flush_scheduled_work() deprecated and add it to feature-removal in the
workqueue tree and push it to linux-next.  So, yeah, it's likely to be
marked deprecated in 2.6.39.

Thanks.

-- 
tejun

Re: [PATCH] xen-pcifront: don't use flush_scheduled_work()

[Tejun Heo]

Sorry, missed the later part.

On Mon, Jan 24, 2011 at 10:39:58AM -0500, Konrad Rzeszutek Wilk wrote:
> > -	/*For PCIE_AER error handling job*/
> 
> Any reason for getting rid of the comment?
> 
> > -	flush_scheduled_work();
> > +	cancel_work_sync(&pdev->op_work);

Because it's obvious from the code now.  If you think it's better to
keep the comment, I have no objection whatsoever.

Thank you.

-- 
tejun