| Message ID | 20230902201112.4401-1-kunyu@nfschina.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ceph/decode: Remove unnecessary ‘0’ values from ret | expand |
On 9/3/23 04:11, Li kunyu wrote: > ret is assigned first, so it does not need to initialize the > assignment. > Bad is not used and can be removed. > > Signed-off-by: Li kunyu <kunyu@nfschina.com> > --- > net/ceph/decode.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/net/ceph/decode.c b/net/ceph/decode.c > index bc109a1a4616..9f5f095d8235 100644 > --- a/net/ceph/decode.c > +++ b/net/ceph/decode.c > @@ -50,7 +50,7 @@ static int > ceph_decode_entity_addr_legacy(void **p, void *end, > struct ceph_entity_addr *addr) > { > - int ret = -EINVAL; > + int ret = 0; > > /* Skip rest of type field */ > ceph_decode_skip_n(p, end, 3, bad); Hi Kunyu, The 'bad' lable is used here in this macro. Thanks - Xiubo > @@ -66,8 +66,7 @@ ceph_decode_entity_addr_legacy(void **p, void *end, > sizeof(addr->in_addr), bad); > addr->in_addr.ss_family = > be16_to_cpu((__force __be16)addr->in_addr.ss_family); > - ret = 0; > -bad: > + > return ret; > } >
On Sun, Sep 03, 2023 at 04:11:12AM +0800, Li kunyu wrote: > ret is assigned first, so it does not need to initialize the > assignment. > Bad is not used and can be removed. > > Signed-off-by: Li kunyu <kunyu@nfschina.com> Hi Li Kunyu, A few things: * Your clock seems to be in the future. * I see you have posted similar similar changes to related code. Please consider combining them into a single patch, or a patch-set. * Please set the target tree, net-next Subject: [PATCH net-next] ... * net-next is currently closed ## Form letter - net-next-closed The merge window for v6.6 has begun and therefore net-next is closed for new drivers, features, code refactoring and optimizations. We are currently accepting bug fixes only. Please repost when net-next reopens after Sept 11th. RFC patches sent for review only are obviously welcome at any time. See: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle -- pw-bot: defer
diff --git a/net/ceph/decode.c b/net/ceph/decode.c index bc109a1a4616..9f5f095d8235 100644 --- a/net/ceph/decode.c +++ b/net/ceph/decode.c @@ -50,7 +50,7 @@ static int ceph_decode_entity_addr_legacy(void **p, void *end, struct ceph_entity_addr *addr) { - int ret = -EINVAL; + int ret = 0; /* Skip rest of type field */ ceph_decode_skip_n(p, end, 3, bad); @@ -66,8 +66,7 @@ ceph_decode_entity_addr_legacy(void **p, void *end, sizeof(addr->in_addr), bad); addr->in_addr.ss_family = be16_to_cpu((__force __be16)addr->in_addr.ss_family); - ret = 0; -bad: + return ret; }
ret is assigned first, so it does not need to initialize the assignment. Bad is not used and can be removed. Signed-off-by: Li kunyu <kunyu@nfschina.com> --- net/ceph/decode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)