Message ID | 20180724192918.31165-11-sthemmin@microsoft.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Series | net whitespace cleanups | expand |
(removed tons of Cc to make v9fs-developer@ happy - please do include linux-kernel@vger.kernel.org next time though, I only saw this patch by chance snooping at netdev) Stephen Hemminger wrote on Tue, Jul 24, 2018: > Remove trailing whitespace and blank lines at EOF > > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> 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) > --- > net/9p/client.c | 4 ++-- > net/9p/trans_virtio.c | 2 +- > net/9p/util.c | 1 - > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/net/9p/client.c b/net/9p/client.c > index 5c1343195292..ff02826e0407 100644 > --- a/net/9p/client.c > +++ b/net/9p/client.c > @@ -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; > diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c > index 05006cbb3361..279b24488d79 100644 > --- a/net/9p/trans_virtio.c > +++ b/net/9p/trans_virtio.c > @@ -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. > diff --git a/net/9p/util.c b/net/9p/util.c > index 59f278e64f58..55ad98277e85 100644 > --- a/net/9p/util.c > +++ b/net/9p/util.c > @@ -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); > -
diff --git a/net/9p/client.c b/net/9p/client.c index 5c1343195292..ff02826e0407 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -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; diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 05006cbb3361..279b24488d79 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -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. diff --git a/net/9p/util.c b/net/9p/util.c index 59f278e64f58..55ad98277e85 100644 --- a/net/9p/util.c +++ b/net/9p/util.c @@ -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); -
Remove trailing whitespace and blank lines at EOF Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- net/9p/client.c | 4 ++-- net/9p/trans_virtio.c | 2 +- net/9p/util.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)