From: Anna Schumaker <Anna.Schumaker@Netapp.com>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: <linux-rdma@vger.kernel.org>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v1 01/19] xprtrdma: Add proper SPDX tags for NetApp-contributed source
Date: Mon, 7 May 2018 10:28:13 -0400 [thread overview]
Message-ID: <60fdeb9b-f11b-9e29-2609-2f3da2a57d20@Netapp.com> (raw)
In-Reply-To: <AD3908D5-D04C-4CDB-8ABD-14AB62984A2B@oracle.com>
On 05/07/2018 10:11 AM, Chuck Lever wrote:
> Hi Anna-
>
> Thanks for the review!
>
>
>> On May 7, 2018, at 9:27 AM, Anna Schumaker <anna.schumaker@netapp.com> wrote:
>>
>> Hi Chuck,
>>
>> On 05/04/2018 03:34 PM, Chuck Lever wrote:
>>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>>> ---
>>> include/linux/sunrpc/rpc_rdma.h | 1 +
>>> include/linux/sunrpc/xprtrdma.h | 1 +
>>> net/sunrpc/xprtrdma/module.c | 1 +
>>> net/sunrpc/xprtrdma/rpc_rdma.c | 1 +
>>> net/sunrpc/xprtrdma/transport.c | 1 +
>>> net/sunrpc/xprtrdma/verbs.c | 1 +
>>> net/sunrpc/xprtrdma/xprt_rdma.h | 1 +
>>> 7 files changed, 7 insertions(+)
>>>
>>> diff --git a/include/linux/sunrpc/rpc_rdma.h b/include/linux/sunrpc/rpc_rdma.h
>>> index 8f144db..92d182f 100644
>>> --- a/include/linux/sunrpc/rpc_rdma.h
>>> +++ b/include/linux/sunrpc/rpc_rdma.h
>>> @@ -1,3 +1,4 @@
>>> +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
>>> /*
>>> * Copyright (c) 2015-2017 Oracle. All rights reserved.
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>> diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
>>> index 5859563..86fc38f 100644
>>> --- a/include/linux/sunrpc/xprtrdma.h
>>> +++ b/include/linux/sunrpc/xprtrdma.h
>>> @@ -1,3 +1,4 @@
>>> +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
>>> /*
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>> *
>>> diff --git a/net/sunrpc/xprtrdma/module.c b/net/sunrpc/xprtrdma/module.c
>>> index a762d19..f338065 100644
>>> --- a/net/sunrpc/xprtrdma/module.c
>>> +++ b/net/sunrpc/xprtrdma/module.c
>>> @@ -1,3 +1,4 @@
>>> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
>>
>> I'm not familiar with hte SPDX-License-Identifier tag. Is there a reason it has to exist in a separate comment block at the top of the file instead of getting rolled in with the copyright stuff right below it?
>
> I believe that each tag is meant to be parsed by a script
> to produce a license manifest file for packaging. Thus the
> tag is maintained on a separate line using a specific
> format.
>
> More information is at https://spdx.org
I'll take a look there, thanks!
>
>
>> Either way, can you use the C-style ("/* ... */") comments here (and in a few other places below) for consistency?
>
> Here is a mechanical survey of familiar kernel source
> files that already have an SPDX tag.
>
> [cel@klimt linux]$ grep SPDX net/sunrpc/*
> grep: net/sunrpc/auth_gss: Is a directory
> net/sunrpc/auth_null.c:// SPDX-License-Identifier: GPL-2.0
> net/sunrpc/auth_unix.c:// SPDX-License-Identifier: GPL-2.0
> net/sunrpc/debugfs.c:// SPDX-License-Identifier: GPL-2.0
> net/sunrpc/Makefile:# SPDX-License-Identifier: GPL-2.0
> net/sunrpc/netns.h:/* SPDX-License-Identifier: GPL-2.0 */
> net/sunrpc/xprtmultipath.c:// SPDX-License-Identifier: GPL-2.0
> grep: net/sunrpc/xprtrdma: Is a directory
> net/sunrpc/xprtsock.c:// SPDX-License-Identifier: GPL-2.0
> [cel@klimt linux]$ grep SPDX fs/nfs/*
> grep: fs/nfs/blocklayout: Is a directory
> fs/nfs/cache_lib.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/cache_lib.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/callback.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/callback.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/callback_proc.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/callback_xdr.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/delegation.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/dns_resolve.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/dns_resolve.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/export.c:// SPDX-License-Identifier: GPL-2.0
> grep: fs/nfs/filelayout: Is a directory
> grep: fs/nfs/flexfilelayout: Is a directory
> fs/nfs/internal.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/io.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/iostat.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/Makefile:# SPDX-License-Identifier: GPL-2.0
> fs/nfs/mount_clnt.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/netns.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs2xdr.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs3acl.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs3_fs.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs3proc.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs3xdr.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs42.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs42proc.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs42xdr.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4file.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4_fs.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs4getroot.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4namespace.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4session.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs4sysctl.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4trace.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfs4trace.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfs.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/nfsroot.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfstrace.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/nfstrace.h:/* SPDX-License-Identifier: GPL-2.0 */
> fs/nfs/proc.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/symlink.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/sysctl.c:// SPDX-License-Identifier: GPL-2.0
> fs/nfs/unlink.c:// SPDX-License-Identifier: GPL-2.0
> [cel@klimt linux]$
>
> The tags I've proposed are consistent with other usage:
>
> -> .c files use // ... comments
> -> .h files use /* ... */ comments
> -> Makefiles use # comments
>
> There were no complaints from checkpatch.pl about the
> comment style in my patch.
Ah, okay. It's probably best to go with how everybody else uses it (although I still wonder why they use different styles for .c and .h files). I'll take your patch the way it is now.
>
>
>> Thanks,
>> Anna
>>
>>> /*
>>> * Copyright (c) 2015, 2017 Oracle. All rights reserved.
>>> */
>>> diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
>>> index e8adad3..8f89e3f 100644
>>> --- a/net/sunrpc/xprtrdma/rpc_rdma.c
>>> +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
>>> @@ -1,3 +1,4 @@
>>> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
>>> /*
>>> * Copyright (c) 2014-2017 Oracle. All rights reserved.
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>> diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
>>> index cc1aad3..4717578 100644
>>> --- a/net/sunrpc/xprtrdma/transport.c
>>> +++ b/net/sunrpc/xprtrdma/transport.c
>>> @@ -1,3 +1,4 @@
>>> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
>>> /*
>>> * Copyright (c) 2014-2017 Oracle. All rights reserved.
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>> diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
>>> index c345d36..10f5032 100644
>>> --- a/net/sunrpc/xprtrdma/verbs.c
>>> +++ b/net/sunrpc/xprtrdma/verbs.c
>>> @@ -1,3 +1,4 @@
>>> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
>>> /*
>>> * Copyright (c) 2014-2017 Oracle. All rights reserved.
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>> diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
>>> index cb41b12..e83ba758 100644
>>> --- a/net/sunrpc/xprtrdma/xprt_rdma.h
>>> +++ b/net/sunrpc/xprtrdma/xprt_rdma.h
>>> @@ -1,3 +1,4 @@
>>> +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
>>> /*
>>> * Copyright (c) 2014-2017 Oracle. All rights reserved.
>>> * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> Chuck Lever
>
>
>
next prev parent reply other threads:[~2018-05-07 14:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-04 19:34 [PATCH v1 00/19] NFS/RDMA client patches for next Chuck Lever
2018-05-04 19:34 ` [PATCH v1 01/19] xprtrdma: Add proper SPDX tags for NetApp-contributed source Chuck Lever
2018-05-07 13:27 ` Anna Schumaker
2018-05-07 14:11 ` Chuck Lever
2018-05-07 14:28 ` Anna Schumaker [this message]
2018-05-14 20:37 ` Jason Gunthorpe
2018-05-04 19:34 ` [PATCH v1 02/19] xprtrdma: Try to fail quickly if proto=rdma Chuck Lever
2018-05-04 19:34 ` [PATCH v1 03/19] xprtrdma: Create transport's CM ID in the correct network namespace Chuck Lever
2018-05-04 19:34 ` [PATCH v1 04/19] xprtrdma: Fix max_send_wr computation Chuck Lever
2018-05-04 19:34 ` [PATCH v1 05/19] SUNRPC: Initialize rpc_rqst outside of xprt->reserve_lock Chuck Lever
2018-05-04 19:34 ` [PATCH v1 06/19] SUNRPC: Add a ->free_slot transport callout Chuck Lever
2018-05-04 19:35 ` [PATCH v1 07/19] xprtrdma: Introduce ->alloc_slot call-out for xprtrdma Chuck Lever
2018-05-04 19:35 ` [PATCH v1 08/19] xprtrdma: Make rpc_rqst part of rpcrdma_req Chuck Lever
2018-05-04 19:35 ` [PATCH v1 09/19] xprtrdma: Clean up Receive trace points Chuck Lever
2018-05-04 19:35 ` [PATCH v1 10/19] xprtrdma: Move Receive posting to Receive handler Chuck Lever
2018-05-08 19:40 ` Anna Schumaker
2018-05-08 19:47 ` Chuck Lever
2018-05-08 19:52 ` Anna Schumaker
2018-05-08 19:56 ` Chuck Lever
2018-05-29 18:23 ` Chuck Lever
2018-05-31 20:55 ` Anna Schumaker
2018-05-04 19:35 ` [PATCH v1 11/19] xprtrdma: Remove rpcrdma_ep_{post_recv, post_extra_recv} Chuck Lever
2018-05-04 19:35 ` [PATCH v1 12/19] xprtrdma: Remove rpcrdma_buffer_get_req_locked() Chuck Lever
2018-05-04 19:35 ` [PATCH v1 13/19] xprtrdma: Remove rpcrdma_buffer_get_rep_locked() Chuck Lever
2018-05-04 19:35 ` [PATCH v1 14/19] xprtrdma: Make rpcrdma_sendctx_put_locked() a static function Chuck Lever
2018-05-04 19:35 ` [PATCH v1 15/19] xprtrdma: Return -ENOBUFS when no pages are available Chuck Lever
2018-05-04 19:35 ` [PATCH v1 16/19] xprtrdma: Move common wait_for_buffer_space call to parent function Chuck Lever
2018-05-04 19:35 ` [PATCH v1 17/19] xprtrdma: Wait on empty sendctx queue Chuck Lever
2018-05-04 19:36 ` [PATCH v1 18/19] xprtrdma: Add trace_xprtrdma_dma_map(mr) Chuck Lever
2018-05-04 19:36 ` [PATCH v1 19/19] xprtrdma: Remove transfertypes array Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60fdeb9b-f11b-9e29-2609-2f3da2a57d20@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).