2024-05-08 15:20:16

by Andy Shevchenko

[permalink] [raw]
Subject: [PATCH v1 1/1] lockd: Use *-y instead of *-objs in Makefile

*-objs suffix is reserved rather for (user-space) host programs while
usually *-y suffix is used for kernel drivers (although *-objs works
for that purpose for now).

Let's correct the old usages of *-objs in Makefiles.

Signed-off-by: Andy Shevchenko <[email protected]>
---

Note, the original approach is weirdest from the existing.
Only a few drivers use this (-objs-y) one most likely by mistake.

fs/lockd/Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/lockd/Makefile b/fs/lockd/Makefile
index ac9f9d84510e..fe3e23dd29c3 100644
--- a/fs/lockd/Makefile
+++ b/fs/lockd/Makefile
@@ -7,8 +7,7 @@ ccflags-y += -I$(src) # needed for trace events

obj-$(CONFIG_LOCKD) += lockd.o

-lockd-objs-y += clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
- svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o
-lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
-lockd-objs-$(CONFIG_PROC_FS) += procfs.o
-lockd-objs := $(lockd-objs-y)
+lockd-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
+ svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o
+lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
+lockd-$(CONFIG_PROC_FS) += procfs.o
--
2.43.0.rc1.1336.g36b5255a03ac



2024-05-08 16:00:09

by Benjamin Coddington

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] lockd: Use *-y instead of *-objs in Makefile

On 8 May 2024, at 11:19, Andy Shevchenko wrote:

> *-objs suffix is reserved rather for (user-space) host programs while
> usually *-y suffix is used for kernel drivers (although *-objs works
> for that purpose for now).
>
> Let's correct the old usages of *-objs in Makefiles.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Reviewed-by: Benjamin Coddington <[email protected]>

Ben


2024-05-08 16:04:53

by Chuck Lever III

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] lockd: Use *-y instead of *-objs in Makefile

On Wed, May 08, 2024 at 06:19:38PM +0300, Andy Shevchenko wrote:
> *-objs suffix is reserved rather for (user-space) host programs while
> usually *-y suffix is used for kernel drivers (although *-objs works
> for that purpose for now).
>
> Let's correct the old usages of *-objs in Makefiles.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
>
> Note, the original approach is weirdest from the existing.
> Only a few drivers use this (-objs-y) one most likely by mistake.
>
> fs/lockd/Makefile | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/lockd/Makefile b/fs/lockd/Makefile
> index ac9f9d84510e..fe3e23dd29c3 100644
> --- a/fs/lockd/Makefile
> +++ b/fs/lockd/Makefile
> @@ -7,8 +7,7 @@ ccflags-y += -I$(src) # needed for trace events
>
> obj-$(CONFIG_LOCKD) += lockd.o
>
> -lockd-objs-y += clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
> - svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o
> -lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
> -lockd-objs-$(CONFIG_PROC_FS) += procfs.o
> -lockd-objs := $(lockd-objs-y)
> +lockd-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
> + svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o
> +lockd-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
> +lockd-$(CONFIG_PROC_FS) += procfs.o
> --
> 2.43.0.rc1.1336.g36b5255a03ac
>

Acked-by: Chuck Lever <[email protected]>

Unless, of course, you'd like me to take this through the nfsd tree.

--
Chuck Lever

2024-06-05 21:13:25

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] lockd: Use *-y instead of *-objs in Makefile

On Wed, May 08, 2024 at 12:04:28PM -0400, Chuck Lever wrote:
> On Wed, May 08, 2024 at 06:19:38PM +0300, Andy Shevchenko wrote:
> > *-objs suffix is reserved rather for (user-space) host programs while
> > usually *-y suffix is used for kernel drivers (although *-objs works
> > for that purpose for now).
> >
> > Let's correct the old usages of *-objs in Makefiles.

...

> Acked-by: Chuck Lever <[email protected]>
>
> Unless, of course, you'd like me to take this through the nfsd tree.

Why not? Otherwise it seems nobody have taken it so far.

--
With Best Regards,
Andy Shevchenko



2024-06-06 13:40:58

by Chuck Lever III

[permalink] [raw]
Subject: Re: [PATCH v1 1/1] lockd: Use *-y instead of *-objs in Makefile

On Wed, Jun 05, 2024 at 05:13:02PM -0400, Andy Shevchenko wrote:
> On Wed, May 08, 2024 at 12:04:28PM -0400, Chuck Lever wrote:
> > On Wed, May 08, 2024 at 06:19:38PM +0300, Andy Shevchenko wrote:
> > > *-objs suffix is reserved rather for (user-space) host programs while
> > > usually *-y suffix is used for kernel drivers (although *-objs works
> > > for that purpose for now).
> > >
> > > Let's correct the old usages of *-objs in Makefiles.
>
> ...
>
> > Acked-by: Chuck Lever <[email protected]>
> >
> > Unless, of course, you'd like me to take this through the nfsd tree.
>
> Why not? Otherwise it seems nobody have taken it so far.

Applied to nfsd-next (for v6.11). Thanks!

--
Chuck Lever