2016-01-01 14:08:19

by Geliang Tang

Subject: [PATCH 3/3] lockd: use to_delayed_work

Use to_delayed_work() instead of open-coding it.

Signed-off-by: Geliang Tang <[email protected]>
---
fs/lockd/svc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 44d18ad..b4006c72 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -94,8 +94,7 @@ static unsigned long get_lockd_grace_period(void)

static void grace_ender(struct work_struct *grace)
{
- struct delayed_work *dwork = container_of(grace, struct delayed_work,
- work);
+ struct delayed_work *dwork = to_delayed_work(grace);
struct lockd_net *ln = container_of(dwork, struct lockd_net,
grace_period_end);

--
2.5.0

2016-01-04 22:44:11

by J. Bruce Fields

Subject: Re: [PATCH 3/3] lockd: use to_delayed_work

On Fri, Jan 01, 2016 at 10:06:29PM +0800, Geliang Tang wrote:
> Use to_delayed_work() instead of open-coding it.

Thanks, applying 2/3 and 3/3 for 4.5.--b.

>
> Signed-off-by: Geliang Tang <[email protected]>
> ---
> fs/lockd/svc.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
> index 44d18ad..b4006c72 100644
> --- a/fs/lockd/svc.c
> +++ b/fs/lockd/svc.c
> @@ -94,8 +94,7 @@ static unsigned long get_lockd_grace_period(void)
>
> static void grace_ender(struct work_struct *grace)
> {
> - struct delayed_work *dwork = container_of(grace, struct delayed_work,
> - work);
> + struct delayed_work *dwork = to_delayed_work(grace);
> struct lockd_net *ln = container_of(dwork, struct lockd_net,
> grace_period_end);
>
> --
> 2.5.0
>