net whitespace cleanups
Subsystems (19)
cover net whitespace cleanups
Ran script that I use to check for trailing whitespace and blank lines at end of files across all files in net/ directory. These are errors that checkpatch reports and git flags.
These are the resulting fixes broken up mostly by subsystem.
Stephen Hemminger (18):
sched: fix trailing whitespace
wimax: remove blank lines at EOF
rds: remove trailing whitespace and blank lines
llc: fix whitespace issues
mpls: remove trailing whitepace
xfrm: remove blank lines at EOF
ceph: fix whitespace
sctp: whitespace fixes
ila: remove blank lines at EOF
9p: fix whitespace issues
atm: remove blank lines at EOF
ax25: remove blank line at EOF
x25: remove blank lines at EOF
decnet: whitespace fixes
sunrpc: whitespace fixes
bpfilter: remove trailing newline
l2tp: remove trailing newline
net: remove blank lines at end of file
net/8021q/Makefile | 1 - net/9p/client.c | 4 ++-- net/9p/trans_virtio.c | 2 +- net/9p/util.c | 1 - net/Kconfig | 2 +- net/atm/mpoa_proc.c | 6 ------ net/ax25/ax25_addr.c | 1 - net/ax25/ax25_ds_in.c | 1 - net/ax25/ax25_ds_subr.c | 1 - net/ax25/ax25_ip.c | 1 - net/ax25/ax25_out.c | 1 - net/bpfilter/Kconfig | 1 - net/ceph/Kconfig | 1 - net/ceph/Makefile | 1 - net/ceph/auth_none.c | 1 - net/ceph/auth_none.h | 1 - net/ceph/auth_x.c | 2 -- net/ceph/auth_x.h | 1 - net/ceph/mon_client.c | 2 +- net/ceph/pagevec.c | 1 - net/core/neighbour.c | 1 - net/decnet/Kconfig | 1 - net/decnet/Makefile | 1 - net/decnet/TODO | 5 ++--- net/decnet/dn_fib.c | 2 -- net/decnet/dn_nsp_in.c | 1 - net/decnet/dn_nsp_out.c | 1 - net/decnet/dn_route.c | 1 - net/decnet/dn_rules.c | 2 -- net/decnet/netfilter/Makefile | 1 - net/decnet/netfilter/dn_rtmsg.c | 1 - net/dns_resolver/dns_key.c | 1 - net/ieee802154/core.c | 1 - net/ieee802154/nl_policy.c | 1 - net/ipv4/Kconfig | 4 ++-- net/ipv4/Makefile | 2 +- net/ipv4/bpfilter/Makefile | 1 - net/ipv6/Kconfig | 2 +- net/ipv6/ila/ila_common.c | 1 - net/ipv6/ila/ila_xlat.c | 1 - net/iucv/af_iucv.c | 1 - net/kcm/Kconfig | 1 - net/kcm/kcmsock.c | 1 - net/l2tp/l2tp_core.c | 1 - net/llc/Kconfig | 2 +- net/llc/Makefile | 2 +- net/llc/llc_if.c | 1 - net/mac80211/rc80211_minstrel.c | 1 - net/mpls/mpls_iptunnel.c | 2 +- net/rds/Kconfig | 1 - net/rds/Makefile | 1 - net/rds/ib.c | 1 - net/rds/message.c | 1 - net/rds/rdma_transport.c | 1 - net/rds/tcp.c | 1 - net/rds/transport.c | 1 - net/sched/Kconfig | 4 ++-- net/sched/Makefile | 2 +- net/sched/act_connmark.c | 1 - net/sched/act_pedit.c | 1 - net/sched/cls_basic.c | 1 - net/sctp/Kconfig | 4 ++-- net/sctp/sm_sideeffect.c | 1 - net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 1 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - net/sunrpc/auth_gss/gss_krb5_keys.c | 1 - net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/backchannel_rqst.c | 1 - net/sunrpc/clnt.c | 2 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/stats.c | 1 - net/sunrpc/sunrpc.h | 1 - net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 1 - net/wimax/Makefile | 2 -- net/wimax/debugfs.c | 2 -- net/wimax/op-msg.c | 1 - net/wimax/stack.c | 1 - net/x25/Kconfig | 2 -- net/x25/x25_subr.c | 1 - net/xfrm/Kconfig | 1 - net/xfrm/xfrm_user.c | 1 - 86 files changed, 24 insertions(+), 103 deletions(-)
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): 20180724192918.31165-1-sthemmin-0li6OtcxBFHby3iVrkZq2A@public.gmane.org
PATCH 1/18 sched: fix trailing whitespace
Remove trailing whitespace and blank lines at EOF
Signed-off-by Stephen Hemminger <[email protected]>
--- net/sched/Kconfig | 4 ++-- net/sched/Makefile | 2 +- net/sched/act_connmark.c | 1 - net/sched/act_pedit.c | 1 - net/sched/cls_basic.c | 1 - 5 files changed, 3 insertions(+), 6 deletions(-)
net/sched/Kconfig +2 -2
@@ -1,6 +1,6 @@ # # Traffic control configuration. -# +# menuconfig NET_SCHED bool "QoS and/or fair queueing"
@@ -706,7 +706,7 @@ config NET_CLS_ACT config NET_ACT_POLICE tristate "Traffic Policing" - depends on NET_CLS_ACT + depends on NET_CLS_ACT ---help--- Say Y here if you want to do traffic policing, i.e. strict bandwidth limiting. This action replaces the existing policing
net/sched/Makefile +1 -1
@@ -33,7 +33,7 @@ obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o obj-$(CONFIG_NET_SCH_RED) += sch_red.o obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o -obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o +obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o obj-$(CONFIG_NET_SCH_SFB) += sch_sfb.o obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o
net/sched/act_connmark.c +0 -1
@@ -252,4 +252,3 @@ module_exit(connmark_cleanup_module);MODULE_AUTHOR ("Felix Fietkau <[email protected]>" );MODULE_DESCRIPTION ("Connection tracking mark restoring" );MODULE_LICENSE ("GPL" ); -
net/sched/act_pedit.c +0 -1
@@ -516,4 +516,3 @@ static void __exit pedit_cleanup_module(void)module_init (pedit_init_module);module_exit (pedit_cleanup_module); -
net/sched/cls_basic.c +0 -0
@@ -324,4 +324,3 @@ static void __exit exit_basic(void) module_init(init_basic) module_exit(exit_basic) MODULE_LICENSE("GPL");
PATCH 2/18 wimax: remove blank lines at EOF
In reply to a message not in the archiveSigned-off-by Stephen Hemminger <[email protected]>
--- net/wimax/Makefile | 2 -- net/wimax/debugfs.c | 2 -- net/wimax/op-msg.c | 1 - net/wimax/stack.c | 1 - 4 files changed, 6 deletions(-)
net/wimax/Makefile +0 -2
@@ -11,5 +11,3 @@ wimax-y := \ stack.o wimax-$(CONFIG_DEBUG_FS) += debugfs.o - -
net/wimax/debugfs.c +0 -2
@@ -76,5 +76,3 @@ void wimax_debugfs_rm(struct wimax_dev *wimax_dev) {debugfs_remove_recursive (wimax_dev->debugfs_dentry); } - -
net/wimax/op-msg.c +0 -1
@@ -404,4 +404,3 @@ int wimax_gnl_doit_msg_from_user(struct sk_buff *skb, struct genl_info *info)d_fnend (3 ,NULL ,"(skb %p info %p) = %d\n" , skb, info, result);return result; } -
net/wimax/stack.c +0 -0
@@ -630,4 +630,3 @@ module_exit(wimax_subsys_exit);MODULE_AUTHOR ("Intel Corporation <[email protected]>" );MODULE_DESCRIPTION ("Linux WiMAX stack" );MODULE_LICENSE ("GPL" );
PATCH 5/18 mpls: remove trailing whitepace
In reply to a message not in the archiveSigned-off-by Stephen Hemminger <[email protected]>
--- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mpls/mpls_iptunnel.c +1 -1
@@ -224,7 +224,7 @@ static int mpls_fill_encap_info(struct sk_buff *skb, struct lwtunnel_state *lwtstate) {struct mpls_iptunnel_encap *tun_encap_info; - + tun_encap_info =mpls_lwtunnel_encap (lwtstate); if (nla_put_labels(skb, MPLS_IPTUNNEL_DST, tun_encap_info->labels,
Signature · 1 line
2.18.0
PATCH 6/18 xfrm: remove blank lines at EOF
In reply to a message not in the archiveSigned-off-by Stephen Hemminger <[email protected]>
--- net/xfrm/Kconfig | 1 - net/xfrm/xfrm_user.c | 1 - 2 files changed, 2 deletions(-)
net/xfrm/Kconfig +0 -1
@@ -87,4 +87,3 @@ config NET_KEY_MIGRATE <draft-sugimoto-mip6-pfkey-migrate>. If unsure, say N. -
net/xfrm/xfrm_user.c +0 -0
@@ -3280,4 +3280,3 @@ module_init(xfrm_user_init);module_exit (xfrm_user_exit);MODULE_LICENSE ("GPL" );MODULE_ALIAS_NET_PF_PROTO (PF_NETLINK ,NETLINK_XFRM );
PATCH 8/18 sctp: whitespace fixes
In reply to a message not in the archiveRemove blank line at EOF and trailing whitespace.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/sctp/Kconfig | 4 ++-- net/sctp/sm_sideeffect.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
net/sctp/Kconfig +2 -2
@@ -41,8 +41,8 @@ config SCTP_DBG_OBJCNT bool "SCTP: Debug object counts" depends on PROC_FS help - If you say Y, this will enable debugging support for counting the - type of objects that are currently allocated. This is useful for + If you say Y, this will enable debugging support for counting the + type of objects that are currently allocated. This is useful for identifying memory leaks. This debug information can be viewed by 'cat /proc/net/sctp/sctp_dbg_objcnt'
net/sctp/sm_sideeffect.c +0 -0
@@ -1827,4 +1827,3 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, error = -ENOMEM ; goto out; }
Re: [PATCH PATCH net-next 08/18] sctp: whitespace fixes
Quoted 40 lines · Stephen Hemminger
Remove blank line at EOF and trailing whitespace.
Signed-off-by Stephen Hemminger <[email protected]>--- net/sctp/Kconfig | 4 ++-- net/sctp/sm_sideeffect.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)net/sctp/Kconfig +2
-2@@ -41,8 +41,8 @@ config SCTP_DBG_OBJCNT bool "SCTP: Debug object counts" depends on PROC_FS help - If you say Y, this will enable debugging support for counting the - type of objects that are currently allocated. This is useful for + If you say Y, this will enable debugging support for counting the + type of objects that are currently allocated. This is useful for identifying memory leaks. This debug information can be viewed by 'cat /proc/net/sctp/sctp_dbg_objcnt'net/sctp/sm_sideeffect.c +0
-1@@ -1827,4 +1827,3 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, error = -ENOMEM ; goto out; } -Signature · 6 lines
2.18.0 -- To unsubscribe from this list: send the line "unsubscribe linux-sctp" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Acked-by Neil Horman <[email protected]>
PATCH 10/18 9p: fix whitespace issues
In reply to a message not in the archiveRemove trailing whitespace and blank lines at EOF
Signed-off-by Stephen Hemminger <[email protected]>
--- net/9p/client.c | 4 ++-- net/9p/trans_virtio.c | 2 +- net/9p/util.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)
net/9p/client.c +2 -2
@@ -341,7 +341,7 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)* buffer to read the data into */ tag++; -if (tag >= c->max_tag) +if (tag >= c->max_tag)return NULL ; row = tag /P9_ROW_MAXTAG ;
@@ -1576,7 +1576,7 @@ p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err)int count =iov_iter_count (to);int rsize, non_zc =0 ;char *dataptr; - + rsize = fid->iounit;if (!rsize || rsize > clnt->msize-P9_IOHDRSZ ) rsize = clnt->msize -P9_IOHDRSZ ;
net/9p/trans_virtio.c +1 -1
@@ -446,7 +446,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, out +=pack_sg_list_p (chan->sg, out,VIRTQUEUE_NUM , out_pages, out_nr_pages, offs, outlen); } - +/* * Take care of in data * For example TREAD have 11.
net/9p/util.c +0 -0
@@ -138,4 +138,3 @@ int p9_idpool_check(int id, struct p9_idpool *p)return idr_find (&p->pool, id) !=NULL ; }EXPORT_SYMBOL (p9_idpool_check);
Dominique Martinet
maintainerRe: [PATCH PATCH net-next 10/18] 9p: fix whitespace issues
(removed tons of Cc to make v9fs-developer@ happy - please do include [email protected] next time though, I only saw this patch by chance snooping at netdev)
Stephen Hemminger wrote on Tue, Jul 24, 2018:
Quoted 3 lines
Remove trailing whitespace and blank lines at EOF
Signed-off-by Stephen Hemminger <[email protected]>
LGTM, I'm not sure if someone would pick the whole series but as other maintainers seem to have taken individual patches I've taken this one as there's potential conflicts with what I have (planning to remove the whole net/9p/util.c file)
Quoted 50 lines
--- net/9p/client.c | 4 ++-- net/9p/trans_virtio.c | 2 +- net/9p/util.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)net/9p/client.c +2
-2@@ -341,7 +341,7 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)* buffer to read the data into */ tag++; -if (tag >= c->max_tag) +if (tag >= c->max_tag)return NULL ; row = tag /P9_ROW_MAXTAG ;@@ -1576,7 +1576,7 @@ p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err)int count =iov_iter_count (to);int rsize, non_zc =0 ;char *dataptr; - + rsize = fid->iounit;if (!rsize || rsize > clnt->msize-P9_IOHDRSZ ) rsize = clnt->msize -P9_IOHDRSZ ;net/9p/trans_virtio.c +1
-1@@ -446,7 +446,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, out +=pack_sg_list_p (chan->sg, out,VIRTQUEUE_NUM , out_pages, out_nr_pages, offs, outlen); } - +/* * Take care of in data * For example TREAD have 11. net/9p/util.c +0
-1@@ -138,4 +138,3 @@ int p9_idpool_check(int id, struct p9_idpool *p)return idr_find (&p->pool, id) !=NULL ; }EXPORT_SYMBOL (p9_idpool_check); -
Signature · 1 line
Dominique Martinet
PATCH 12/18 ax25: remove blank line at EOF
In reply to a message not in the archiveSigned-off-by Stephen Hemminger <[email protected]>
--- net/ax25/ax25_addr.c | 1 - net/ax25/ax25_ds_in.c | 1 - net/ax25/ax25_ds_subr.c | 1 - net/ax25/ax25_ip.c | 1 - net/ax25/ax25_out.c | 1 - 5 files changed, 5 deletions(-)
net/ax25/ax25_addr.c +0 -1
@@ -304,4 +304,3 @@ void ax25_digi_invert(const ax25_digi *in, ax25_digi *out) } } } -
net/ax25/ax25_ds_in.c +0 -1
@@ -299,4 +299,3 @@ int ax25_ds_frame_in(ax25_cb *ax25, struct sk_buff *skb, int type)return queued; } -
net/ax25/ax25_ds_subr.c +0 -1
@@ -205,4 +205,3 @@ void ax25_dama_off(ax25_cb *ax25) ax25->condition &= ~AX25_COND_DAMA_MODE ;ax25_dev_dama_off (ax25->ax25_dev); } -
net/ax25/ax25_ip.c +0 -1
@@ -249,4 +249,3 @@ const struct header_ops ax25_header_ops = {EXPORT_SYMBOL (ax25_header_ops);EXPORT_SYMBOL (ax25_ip_xmit); -
net/ax25/ax25_out.c +0 -0
@@ -394,4 +394,3 @@ int ax25_check_iframes_acked(ax25_cb *ax25, unsigned short nr) }return 0 ; }
PATCH 18/18 net: remove blank lines at end of file
In reply to a message not in the archiveSeveral files have extra line at end of file.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/8021q/Makefile | 1 - net/Kconfig | 2 +- net/core/neighbour.c | 1 - net/dns_resolver/dns_key.c | 1 - net/ieee802154/core.c | 1 - net/ieee802154/nl_policy.c | 1 - net/ipv4/Kconfig | 4 ++-- net/ipv4/Makefile | 2 +- net/ipv6/Kconfig | 2 +- net/iucv/af_iucv.c | 1 - net/kcm/Kconfig | 1 - net/kcm/kcmsock.c | 1 - net/mac80211/rc80211_minstrel.c | 1 - 13 files changed, 5 insertions(+), 14 deletions(-)
net/8021q/Makefile +0 -1
@@ -9,4 +9,3 @@ obj-$(CONFIG_VLAN_8021Q) += 8021q.o 8021q-$(CONFIG_VLAN_8021Q_GVRP) += vlan_gvrp.o 8021q-$(CONFIG_VLAN_8021Q_MVRP) += vlan_mvrp.o 8021q-$(CONFIG_PROC_FS) += vlanproc.o -
net/Kconfig +1 -1
@@ -12,7 +12,7 @@ menuconfig NET The reason is that some programs need kernel networking support even when running on a stand-alone machine that isn't connected to any other computer. - + If you are upgrading from an older kernel, you should consider updating your networking tools too because changes in the kernel and the tools often go hand in hand. The tools are
net/core/neighbour.c +0 -1
@@ -3274,4 +3274,3 @@ static int __init neigh_init(void) }subsys_initcall (neigh_init); -
net/dns_resolver/dns_key.c +0 -1
@@ -320,4 +320,3 @@ static void __exit exit_dns_resolver(void) module_init(init_dns_resolver) module_exit(exit_dns_resolver) MODULE_LICENSE("GPL"); -
net/ieee802154/core.c +0 -1
@@ -400,4 +400,3 @@ module_exit(wpan_phy_class_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("IEEE 802.15.4 configuration interface" );MODULE_AUTHOR ("Dmitry Eremin-Solenikov" ); -
net/ieee802154/nl_policy.c +0 -1
@@ -75,4 +75,3 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { [IEEE802154_ATTR_LLSEC_DEV_OVERRIDE] = { .type = NLA_U8, }, [IEEE802154_ATTR_LLSEC_DEV_KEY_MODE] = { .type = NLA_U8, }, }; -
net/ipv4/Kconfig +2 -2
@@ -430,7 +430,7 @@ config INET_DIAG Support for INET (TCP, DCCP, etc) socket monitoring interface used by native Linux tools such as ss. ss is included in iproute2, currently downloadable at: - + http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 If unsure, say Y.
@@ -600,7 +600,7 @@ config TCP_CONG_VENO distinguishing to circumvent the difficult judgment of the packet loss type. TCP Veno cuts down less congestion window in response to random loss packets. - See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> + See <http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1177186> config TCP_CONG_YEAH tristate "YeAH TCP"
net/ipv4/Makefile +1 -1
@@ -43,7 +43,7 @@ obj-$(CONFIG_INET_XFRM_MODE_TRANSPORT) += xfrm4_mode_transport.o obj-$(CONFIG_INET_XFRM_MODE_TUNNEL) += xfrm4_mode_tunnel.o obj-$(CONFIG_IP_PNP) += ipconfig.o obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ -obj-$(CONFIG_INET_DIAG) += inet_diag.o +obj-$(CONFIG_INET_DIAG) += inet_diag.o obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o obj-$(CONFIG_INET_UDP_DIAG) += udp_diag.o obj-$(CONFIG_INET_RAW_DIAG) += raw_diag.o
net/ipv6/Kconfig +1 -1
@@ -15,7 +15,7 @@ menuconfig IPV6 Documentation/networking/ipv6.txt and read the HOWTO at <http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/> - To compile this protocol support as a module, choose M here: the + To compile this protocol support as a module, choose M here: the module will be called ipv6. if IPV6
net/iucv/af_iucv.c +0 -1
@@ -2515,4 +2515,3 @@ MODULE_DESCRIPTION("IUCV Sockets ver " VERSION);MODULE_VERSION (VERSION );MODULE_LICENSE ("GPL" );MODULE_ALIAS_NETPROTO (PF_IUCV ); -
net/kcm/Kconfig +0 -1
@@ -8,4 +8,3 @@ config AF_KCM KCM (Kernel Connection Multiplexor) sockets provide a method for multiplexing messages of a message based application protocol over kernel connectons (e.g. TCP connections). -
net/kcm/kcmsock.c +0 -1
@@ -2104,4 +2104,3 @@ module_exit(kcm_exit);MODULE_LICENSE ("GPL" );MODULE_ALIAS_NETPROTO (PF_KCM ); -
net/mac80211/rc80211_minstrel.c +0 -0
@@ -751,4 +751,3 @@ rc80211_minstrel_exit(void) {ieee80211_rate_control_unregister (&mac80211_minstrel); }
PATCH 3/18 rds: remove trailing whitespace and blank lines
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/rds/Kconfig | 1 - net/rds/Makefile | 1 - net/rds/ib.c | 1 - net/rds/message.c | 1 - net/rds/rdma_transport.c | 1 - net/rds/tcp.c | 1 - net/rds/transport.c | 1 - 7 files changed, 7 deletions(-)
net/rds/Kconfig +0 -1
@@ -24,4 +24,3 @@ config RDS_DEBUG bool "RDS debugging messages" depends on RDS default n -
net/rds/Makefile +0 -1
@@ -15,4 +15,3 @@ rds_tcp-y := tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \ tcp_send.o tcp_stats.o ccflags-$(CONFIG_RDS_DEBUG) := -DRDS_DEBUG -
net/rds/ib.c +0 -1
@@ -568,4 +568,3 @@ int rds_ib_init(void) }MODULE_LICENSE ("GPL" ); -
net/rds/message.c +0 -1
@@ -514,4 +514,3 @@ void rds_message_unmapped(struct rds_message *rm)wake_up_interruptible (&rm->m_flush_wait); }EXPORT_SYMBOL_GPL (rds_message_unmapped); -
net/rds/rdma_transport.c +0 -1
@@ -281,4 +281,3 @@ module_exit(rds_rdma_exit);MODULE_AUTHOR ("Oracle Corporation <[email protected]>" );MODULE_DESCRIPTION ("RDS: IB transport" );MODULE_LICENSE ("Dual BSD/GPL" ); -
net/rds/tcp.c +0 -1
@@ -717,4 +717,3 @@ module_init(rds_tcp_init);MODULE_AUTHOR ("Oracle Corporation <[email protected]>" );MODULE_DESCRIPTION ("RDS: TCP transport" );MODULE_LICENSE ("Dual BSD/GPL" ); -
net/rds/transport.c +0 -1
@@ -159,4 +159,3 @@ unsigned int rds_trans_stats_info_copy(struct rds_info_iterator *iter,return total; } -
Signature · 1 line
2.18.0
PATCH 4/18 llc: fix whitespace issues
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/llc/Kconfig | 2 +- net/llc/Makefile | 2 +- net/llc/llc_if.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
net/llc/Kconfig +1 -1
@@ -6,5 +6,5 @@ config LLC2 tristate "ANSI/IEEE 802.2 LLC type 2 Support" select LLC help - This is a Logical Link Layer type 2, connection oriented support. + This is a Logical Link Layer type 2, connection oriented support. Select this if you want to have support for PF_LLC sockets.
net/llc/Makefile +1 -1
@@ -4,7 +4,7 @@ # Copyright (c) 1997 by Procom Technology,Inc. # 2001-2003 by Arnaldo Carvalho de Melo <[email protected]> # -# This program can be redistributed or modified under the terms of the +# This program can be redistributed or modified under the terms of the # GNU General Public License as published by the Free Software Foundation. # This program is distributed without any warranty or implied warranty # of merchantability or fitness for a particular purpose.
net/llc/llc_if.c +0 -1
@@ -151,4 +151,3 @@ int llc_send_disc(struct sock *sk)sock_put (sk);return rc; } -
Signature · 1 line
2.18.0
PATCH 7/18 ceph: fix whitespace
In reply to Stephen HemmingerRemove blank lines at end of file and trailing whitespace.
Signed-off-by Stephen Hemminger <[email protected]>
--- net/ceph/Kconfig | 1 - net/ceph/Makefile | 1 - net/ceph/auth_none.c | 1 - net/ceph/auth_none.h | 1 - net/ceph/auth_x.c | 2 -- net/ceph/auth_x.h | 1 - net/ceph/mon_client.c | 2 +- net/ceph/pagevec.c | 1 - 8 files changed, 1 insertion(+), 9 deletions(-)
net/ceph/Kconfig +0 -1
@@ -41,4 +41,3 @@ config CEPH_LIB_USE_DNS_RESOLVER Documentation/networking/dns_resolver.txt If unsure, say N. -
net/ceph/Makefile +0 -1
@@ -15,4 +15,3 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ auth_x.o \ ceph_fs.o ceph_strings.o ceph_hash.o \ pagevec.o snapshot.o string_table.o -
net/ceph/auth_none.c +0 -1
@@ -142,4 +142,3 @@ int ceph_auth_none_init(struct ceph_auth_client *ac) ac->ops = &ceph_auth_none_ops;return 0 ; } -
net/ceph/auth_none.h +0 -1
@@ -26,4 +26,3 @@ struct ceph_auth_none_info {int ceph_auth_none_init (struct ceph_auth_client *ac);#endif -
net/ceph/auth_x.c +0 -2
@@ -823,5 +823,3 @@ int ceph_x_init(struct ceph_auth_client *ac) out:return ret; } - -
net/ceph/auth_x.h +0 -1
@@ -52,4 +52,3 @@ struct ceph_x_info {int ceph_x_init (struct ceph_auth_client *ac);#endif -
net/ceph/mon_client.c +1 -1
@@ -1249,7 +1249,7 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)if (monc->client->extra_mon_dispatch && monc->client->extra_mon_dispatch (monc->client, msg) ==0 )break ; - +pr_err ("received unknown message type %d %s\n" , type,ceph_msg_type_name (type)); }
net/ceph/pagevec.c +0 -1
@@ -197,4 +197,3 @@ void ceph_zero_page_vector_range(int off, int len, struct page **pages) } }EXPORT_SYMBOL (ceph_zero_page_vector_range); -
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): 20180724192918.31165-8-sthemmin-0li6OtcxBFHby3iVrkZq2A@public.gmane.org
Ilya Dryomov
AppliedRe: [PATCH PATCH net-next 07/18] ceph: fix whitespace
Quoted 88 lines · Stephen Hemminger
Remove blank lines at end of file and trailing whitespace.
Signed-off-by Stephen Hemminger <[email protected]>--- net/ceph/Kconfig | 1 - net/ceph/Makefile | 1 - net/ceph/auth_none.c | 1 - net/ceph/auth_none.h | 1 - net/ceph/auth_x.c | 2 -- net/ceph/auth_x.h | 1 - net/ceph/mon_client.c | 2 +- net/ceph/pagevec.c | 1 - 8 files changed, 1 insertion(+), 9 deletions(-)net/ceph/Kconfig +0
-1@@ -41,4 +41,3 @@ config CEPH_LIB_USE_DNS_RESOLVER Documentation/networking/dns_resolver.txt If unsure, say N. -net/ceph/Makefile +0
-1@@ -15,4 +15,3 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \ auth_x.o \ ceph_fs.o ceph_strings.o ceph_hash.o \ pagevec.o snapshot.o string_table.o -net/ceph/auth_none.c +0
-1@@ -142,4 +142,3 @@ int ceph_auth_none_init(struct ceph_auth_client *ac) ac->ops = &ceph_auth_none_ops;return 0 ; } -net/ceph/auth_none.h +0
-1@@ -26,4 +26,3 @@ struct ceph_auth_none_info {int ceph_auth_none_init (struct ceph_auth_client *ac);#endif -net/ceph/auth_x.c +0
-2@@ -823,5 +823,3 @@ int ceph_x_init(struct ceph_auth_client *ac) out:return ret; } - -net/ceph/auth_x.h +0
-1@@ -52,4 +52,3 @@ struct ceph_x_info {int ceph_x_init (struct ceph_auth_client *ac);#endif -net/ceph/mon_client.c +1
-1@@ -1249,7 +1249,7 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)if (monc->client->extra_mon_dispatch && monc->client->extra_mon_dispatch (monc->client, msg) ==0 )break ; - +pr_err ("received unknown message type %d %s\n" , type,ceph_msg_type_name (type)); }net/ceph/pagevec.c +0
-0
net/ceph/pagevec.c void ceph_zero_page_vector_range(int off, int len, struct page **pages) · line 200
Quoted 4 lines
net/ceph/pagevec.c +0
-1@@ -197,4 +197,3 @@ void ceph_zero_page_vector_range(int off, int len, struct page **pages) } }EXPORT_SYMBOL (ceph_zero_page_vector_range); -
Applied.
Thanks,
Ilya
PATCH 9/18 ila: remove blank lines at EOF
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/ipv6/ila/ila_common.c | 1 - net/ipv6/ila/ila_xlat.c | 1 - 2 files changed, 2 deletions(-)
net/ipv6/ila/ila_common.c +0 -1
@@ -153,4 +153,3 @@ void ila_update_ipv6_locator(struct sk_buff *skb, struct ila_params *p,/* Now change destination address */ iaddr->loc = p->locator; } -
net/ipv6/ila/ila_xlat.c +0 -1
@@ -663,4 +663,3 @@ static int ila_xlat_addr(struct sk_buff *skb, bool sir2ila)return 0 ; } -
Signature · 1 line
2.18.0
PATCH 11/18 atm: remove blank lines at EOF
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/atm/mpoa_proc.c | 6 ------ 1 file changed, 6 deletions(-)
net/atm/mpoa_proc.c +0 -6
@@ -307,9 +307,3 @@ void mpc_proc_clean(void) }#endif /* CONFIG_PROC_FS */ - - - - - -
Signature · 1 line
2.18.0
PATCH 13/18 x25: remove blank lines at EOF
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/x25/Kconfig | 2 -- net/x25/x25_subr.c | 1 - 2 files changed, 3 deletions(-)
net/x25/Kconfig +0 -2
@@ -31,5 +31,3 @@ config X25 To compile this driver as a module, choose M here: the module will be called x25. If unsure, say N. - -
net/x25/x25_subr.c +0 -1
@@ -381,4 +381,3 @@ void x25_check_rbuf(struct sock *sk)x25_stop_timer (sk); } } -
Signature · 1 line
2.18.0
PATCH 14/18 decnet: whitespace fixes
In reply to Stephen HemmingerRemove trailing whitespace and extra lines at EOF
Signed-off-by Stephen Hemminger <[email protected]>
--- net/decnet/Kconfig | 1 - net/decnet/Makefile | 1 - net/decnet/TODO | 5 ++--- net/decnet/dn_fib.c | 2 -- net/decnet/dn_nsp_in.c | 1 - net/decnet/dn_nsp_out.c | 1 - net/decnet/dn_route.c | 1 - net/decnet/dn_rules.c | 2 -- net/decnet/netfilter/Makefile | 1 - net/decnet/netfilter/dn_rtmsg.c | 1 - 10 files changed, 2 insertions(+), 14 deletions(-)
net/decnet/Kconfig +0 -1
@@ -40,4 +40,3 @@ config DECNET_ROUTER to work. See <file:Documentation/networking/decnet.txt> for more information. -
net/decnet/Makefile +0 -1
@@ -8,4 +8,3 @@ decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o decnet-y += sysctl_net_decnet.o obj-$(CONFIG_NETFILTER) += netfilter/ -
net/decnet/TODO +2 -3
@@ -16,14 +16,14 @@ Steve's quick list of things that need finishing off: o Verify errors etc. against POSIX 1003.1g (draft) - o Using send/recvmsg() to get at connect/disconnect data (POSIX 1003.1g) + o Using send/recvmsg() to get at connect/disconnect data (POSIX 1003.1g) [maybe this should be done at socket level... the control data in the send/recvmsg() calls should simply be a vector of set/getsockopt() calls] o check MSG_CTRUNC is set where it should be. - o Find all the commonality between DECnet and IPv4 routing code and extract + o Find all the commonality between DECnet and IPv4 routing code and extract it into a small library of routines. [probably a project for 2.7.xx] o Add perfect socket hashing - an idea suggested by Paul Koning. Currently
@@ -38,4 +38,3 @@ Steve's quick list of things that need finishing off: o DECnet sendpages() function o AIO for DECnet -
net/decnet/dn_fib.c +0 -2
@@ -797,5 +797,3 @@ void __init dn_fib_init(void)rtnl_register_module (THIS_MODULE , PF_DECnet,RTM_DELROUTE , dn_fib_rtm_delroute,NULL ,0 ); } - -
net/decnet/dn_nsp_in.c +0 -1
@@ -912,4 +912,3 @@ int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb)return NET_RX_SUCCESS ; } -
net/decnet/dn_nsp_out.c +0 -1
@@ -701,4 +701,3 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)dn_nsp_send (skb); } -
net/decnet/dn_route.c +0 -1
@@ -1925,4 +1925,3 @@ void __exit dn_route_cleanup(void)remove_proc_entry ("decnet_cache" , init_net.proc_net);dst_entries_destroy (&dn_dst_ops); } -
net/decnet/dn_rules.c +0 -2
@@ -256,5 +256,3 @@ void __exit dn_fib_rules_cleanup(void)rtnl_unlock ();rcu_barrier (); } - -
net/decnet/netfilter/Makefile +0 -1
@@ -3,4 +3,3 @@ # obj-$(CONFIG_DECNET_NF_GRABULATOR) += dn_rtmsg.o -
net/decnet/netfilter/dn_rtmsg.c +0 -1
@@ -158,4 +158,3 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);module_init (dn_rtmsg_init);module_exit (dn_rtmsg_fini); -
Signature · 1 line
2.18.0
PATCH 15/18 sunrpc: whitespace fixes
In reply to Stephen HemmingerRemove trailing whitespace and blank line at EOF
Signed-off-by Stephen Hemminger <[email protected]>
--- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 1 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - net/sunrpc/auth_gss/gss_krb5_keys.c | 1 - net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/backchannel_rqst.c | 1 - net/sunrpc/clnt.c | 2 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/stats.c | 1 - net/sunrpc/sunrpc.h | 1 - net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 1 - 15 files changed, 5 insertions(+), 15 deletions(-)
net/sunrpc/auth_gss/auth_gss.c +1 -1
@@ -1571,7 +1571,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred)if (test_bit (RPCAUTH_CRED_NEGATIVE , &cred->cr_flags)) {unsigned long now = jiffies;unsigned long begin, expire; -struct gss_cred *gss_cred; +struct gss_cred *gss_cred; gss_cred = container_of(cred, struct gss_cred, gc_base); begin = gss_cred->gc_upcall_timestamp;
net/sunrpc/auth_gss/gss_generic_token.c +0 -1
@@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size, }EXPORT_SYMBOL_GPL (g_verify_token_header); -
net/sunrpc/auth_gss/gss_krb5_crypto.c +0 -1
@@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,dprintk ("%s: returning %d\n" , __func__, err);return err; } -
net/sunrpc/auth_gss/gss_krb5_keys.c +0 -1
@@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e, err_out:return ret; } -
net/sunrpc/auth_gss/gss_krb5_seal.c +0 -1
@@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,return gss_get_mic_v2 (ctx, text, token); } } -
net/sunrpc/auth_gss/gss_krb5_unseal.c +0 -1
@@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,return gss_verify_mic_v2 (ctx, message_buffer, read_token); } } -
net/sunrpc/auth_gss/gss_krb5_wrap.c +0 -1
@@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)return gss_unwrap_kerberos_v2 (kctx, offset, buf); } } -
net/sunrpc/auth_gss/svcauth_gss.c +1 -1
@@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net)struct sunrpc_net *sn =net_generic (net, sunrpc_net_id);if (sn->use_gssp_proc) { -remove_proc_entry ("use-gss-proxy" , sn->proc_net_rpc); +remove_proc_entry ("use-gss-proxy" , sn->proc_net_rpc);clear_gssp_clnt (sn); } }
net/sunrpc/backchannel_rqst.c +0 -1
@@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)wake_up (&bc_serv->sv_cb_waitq);spin_unlock (&bc_serv->sv_cb_lock); } -
net/sunrpc/clnt.c +1 -1
@@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt)/* * Free an RPC client */ -static struct rpc_clnt * +static struct rpc_clnt *rpc_free_auth (struct rpc_clnt *clnt) {if (clnt->cl_auth ==NULL )
net/sunrpc/rpcb_clnt.c +1 -1
@@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt, sn->rpcb_local_clnt = clnt; sn->rpcb_local_clnt4 = clnt4; sn->rpcb_is_af_local = is_af_local ?1 :0 ; -smp_wmb (); +smp_wmb (); sn->rpcb_users =1 ; dprintk("RPC: created new rpcb local clients (rpcb_local_clnt: " "%p, rpcb_local_clnt4: %p) for net %x%s\n",
net/sunrpc/stats.c +0 -1
@@ -310,4 +310,3 @@ void rpc_proc_exit(struct net *net)dprintk ("RPC: unregistering /proc/net/rpc\n" );remove_proc_entry ("rpc" , net->proc_net); } -
net/sunrpc/sunrpc.h +0 -1
@@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,int rpc_clients_notifier_register (void );void rpc_clients_notifier_unregister (void );#endif /* _NET_SUNRPC_SUNRPC_H */ -
net/sunrpc/xprt.c +1 -1
@@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req) __must_hold(&req->rq_xprt->recv_lock) {struct rpc_task *task = req->rq_task; - +if (task &&test_bit (RPC_TASK_MSG_RECV , &task->tk_runstate)) {spin_unlock (&req->rq_xprt->recv_lock);set_bit (RPC_TASK_MSG_RECV_WAIT , &task->tk_runstate);
net/sunrpc/xprtsock.c +0 -1
@@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries, max_slot_table_size, 0644);module_param_named (udp_slot_table_entries, xprt_udp_slot_table_entries, slot_table_size,0644 ); -
Signature · 1 line
2.18.0
Re: [PATCH PATCH net-next 15/18] sunrpc: whitespace fixes
Quoted 1 line · Stephen Hemminger
Remove trailing whitespace and blank line at EOF
Looks good to me, I've applied it to my tree.
Thanks!
Anna
Quoted 176 lines
Signed-off-by Stephen Hemminger <[email protected]>--- net/sunrpc/auth_gss/auth_gss.c | 2 +- net/sunrpc/auth_gss/gss_generic_token.c | 1 - net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - net/sunrpc/auth_gss/gss_krb5_keys.c | 1 - net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 - net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/backchannel_rqst.c | 1 - net/sunrpc/clnt.c | 2 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/stats.c | 1 - net/sunrpc/sunrpc.h | 1 - net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 1 - 15 files changed, 5 insertions(+), 15 deletions(-)net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -1571,7 +1571,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred)if (test_bit (RPCAUTH_CRED_NEGATIVE , &cred->cr_flags)) {unsigned long now = jiffies;unsigned long begin, expire; -struct gss_cred *gss_cred; +struct gss_cred *gss_cred; gss_cred = container_of(cred, struct gss_cred, gc_base); begin = gss_cred->gc_upcall_timestamp;net/sunrpc/auth_gss/gss_generic_token.c +0
-1@@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size, }EXPORT_SYMBOL_GPL (g_verify_token_header); -net/sunrpc/auth_gss/gss_krb5_crypto.c +0
-1@@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,dprintk ("%s: returning %d\n" , __func__, err);return err; } -net/sunrpc/auth_gss/gss_krb5_keys.c +0
-1@@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e, err_out:return ret; } -net/sunrpc/auth_gss/gss_krb5_seal.c +0
-1@@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,return gss_get_mic_v2 (ctx, text, token); } } -net/sunrpc/auth_gss/gss_krb5_unseal.c +0
-1@@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,return gss_verify_mic_v2 (ctx, message_buffer, read_token); } } -net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-1@@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)return gss_unwrap_kerberos_v2 (kctx, offset, buf); } } -net/sunrpc/auth_gss/svcauth_gss.c +1
-1@@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net)struct sunrpc_net *sn =net_generic (net, sunrpc_net_id);if (sn->use_gssp_proc) { -remove_proc_entry ("use-gss-proxy" , sn->proc_net_rpc); +remove_proc_entry ("use-gss-proxy" , sn->proc_net_rpc);clear_gssp_clnt (sn); } }net/sunrpc/backchannel_rqst.c +0
-1@@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)wake_up (&bc_serv->sv_cb_waitq);spin_unlock (&bc_serv->sv_cb_lock); } -net/sunrpc/clnt.c +1
-1@@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt)/* * Free an RPC client */ -static struct rpc_clnt * +static struct rpc_clnt *rpc_free_auth (struct rpc_clnt *clnt) {if (clnt->cl_auth ==NULL )net/sunrpc/rpcb_clnt.c +1
-1@@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt, sn->rpcb_local_clnt = clnt; sn->rpcb_local_clnt4 = clnt4; sn->rpcb_is_af_local = is_af_local ?1 :0 ; -smp_wmb (); +smp_wmb (); sn->rpcb_users =1 ; dprintk("RPC: created new rpcb local clients (rpcb_local_clnt: " "%p, rpcb_local_clnt4: %p) for net %x%s\n",net/sunrpc/stats.c +0
-1@@ -310,4 +310,3 @@ void rpc_proc_exit(struct net *net)dprintk ("RPC: unregistering /proc/net/rpc\n" );remove_proc_entry ("rpc" , net->proc_net); } -net/sunrpc/sunrpc.h +0
-1@@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,int rpc_clients_notifier_register (void );void rpc_clients_notifier_unregister (void );#endif /* _NET_SUNRPC_SUNRPC_H */ -net/sunrpc/xprt.c +1
-1@@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req) __must_hold(&req->rq_xprt->recv_lock) {struct rpc_task *task = req->rq_task; - +if (task &&test_bit (RPC_TASK_MSG_RECV , &task->tk_runstate)) {spin_unlock (&req->rq_xprt->recv_lock);set_bit (RPC_TASK_MSG_RECV_WAIT , &task->tk_runstate);net/sunrpc/xprtsock.c +0
-1@@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries, max_slot_table_size, 0644);module_param_named (udp_slot_table_entries, xprt_udp_slot_table_entries, slot_table_size,0644 ); -
PATCH 16/18 bpfilter: remove trailing newline
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/bpfilter/Kconfig | 1 - net/ipv4/bpfilter/Makefile | 1 - 2 files changed, 2 deletions(-)
net/bpfilter/Kconfig +0 -1
@@ -13,4 +13,3 @@ config BPFILTER_UMH help This builds bpfilter kernel module with embedded user mode helper endif -
net/ipv4/bpfilter/Makefile +0 -1
@@ -1,2 +1 @@ obj-$(CONFIG_BPFILTER) += sockopt.o -
Signature · 1 line
2.18.0
PATCH 17/18 l2tp: remove trailing newline
In reply to Stephen HemmingerSigned-off-by Stephen Hemminger <[email protected]>
--- net/l2tp/l2tp_core.c | 1 - 1 file changed, 1 deletion(-)
net/l2tp/l2tp_core.c +0 -1
@@ -1795,4 +1795,3 @@ MODULE_AUTHOR("James Chapman <[email protected]>");MODULE_DESCRIPTION ("L2TP core" );MODULE_LICENSE ("GPL" );MODULE_VERSION (L2TP_DRV_VERSION ); -
Signature · 1 line
2.18.0
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Tue, 24 Jul 2018 12:29:00 -0700
Quoted 5 lines
Ran script that I use to check for trailing whitespace and blank lines at end of files across all files in
net/directory. These are errors that checkpatch reports and git flags.These are the resulting fixes broken up mostly by subsystem.
I skipped 9p, ceph, and sunrpc since those don't go via my tree.
I applied the rest because it's mostly small and won't cause too many conflicts in the future.
Thanks.