Skip to contentSkip to conversation

ceph: Delete unused variable in mds_client

PATCH In review Christos Gkekas 2 participants 3 messages Oct 14, 2017 – Oct 16, 2017 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ceph: Delete unused variable in mds_client

Variable 'err' is set but never used, so should be removed.

---
 fs/ceph/mds_client.c | 2 --
 1 file changed, 2 deletions(-)
fs/ceph/mds_client.c +0 -2
index f23c820..7cd4fd9 100644
@@ -3801,7 +3801,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
 	u32 num_fs;
 	u32 mount_fscid = (u32)-1;
 	u8 struct_v, struct_cv;
-	int err = -EINVAL;
 
 	ceph_decode_need(&p, end, sizeof(u32), bad);
 	epoch = ceph_decode_32(&p);
@@ -3852,7 +3851,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
 				   0, true);
 		ceph_monc_renew_subs(&fsc->client->monc);
 	} else {
-		err = -ENOENT;
 		goto err_out;
 	}
 	return;
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 20 lines · Christos Gkekas

Variable 'err' is set but never used, so should be removed.

---
 fs/ceph/mds_client.c | 2 --
 1 file changed, 2 deletions(-)
fs/ceph/mds_client.c +0 -1
index f23c820..7cd4fd9 100644
@@ -3801,7 +3801,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
        u32 num_fs;
        u32 mount_fscid = (u32)-1;
        u8 struct_v, struct_cv;
-       int err = -EINVAL;
 
        ceph_decode_need(&p, end, sizeof(u32), bad);
        epoch = ceph_decode_32(&p);

fs/ceph/mds_client.c void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg) · line 3856

Quoted 7 lines
fs/ceph/mds_client.c +0 -1
@@ -3852,7 +3851,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
                                   0, true);
                ceph_monc_renew_subs(&fsc->client->monc);
        } else {
-               err = -ENOENT;
                goto err_out;
        }
        return;

This doesn't seem right. I think the original intent was to return -EINVAL if decoding fails (like we do in many other places) and -ENOENT if there is no filesystem with that name. This is user-visible: it's propagated all the way up and reported by mount(8).

I'd rather we do something like this:

commit 2b330133e10e7f53f0b169335c3b6000782e9123

Author: Ilya Dryomov <[email protected]>
Date:   Mon Oct 16 10:32:50 2017 +0200

ceph: -EINVAL on decoding failure in ceph_mdsc_handle_fsmap()

Don't set ->mdsmap_err to -ENOENT unconditionally, and drop unneeded return statement while at it.

fs/ceph/mds_client.c +0 -0
index 51f8af685a1f..aaa8879c8098 100644
@@ -3878,14 +3878,14 @@ void ceph_mdsc_handle_fsmap(struct

ceph_mds_client *mdsc, struct ceph_msg *msg)

                goto err_out;
        }
        return;
+
 bad:
        pr_err("error decoding fsmap\n");
 err_out:
        mutex_lock(&mdsc->mutex);
-       mdsc->mdsmap_err = -ENOENT;
+       mdsc->mdsmap_err = err;
        __wake_requests(mdsc, &mdsc->waiting_for_map);
        mutex_unlock(&mdsc->mutex);

- return;
}

/*

Thanks,

Ilya

#2 lore raw
Quoted 70 lines · Ilya Dryomov
Quoted 20 lines · Christos Gkekas

Variable 'err' is set but never used, so should be removed.

---
 fs/ceph/mds_client.c | 2 --
 1 file changed, 2 deletions(-)
fs/ceph/mds_client.c +0 -1
index f23c820..7cd4fd9 100644
@@ -3801,7 +3801,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
        u32 num_fs;
        u32 mount_fscid = (u32)-1;
        u8 struct_v, struct_cv;
-       int err = -EINVAL;
 
        ceph_decode_need(&p, end, sizeof(u32), bad);
        epoch = ceph_decode_32(&p);

fs/ceph/mds_client.c void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg) · line 3856

Quoted 7 lines
fs/ceph/mds_client.c +0 -1
@@ -3852,7 +3851,6 @@ void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
                                   0, true);
                ceph_monc_renew_subs(&fsc->client->monc);
        } else {
-               err = -ENOENT;
                goto err_out;
        }
        return;

This doesn't seem right. I think the original intent was to return -EINVAL if decoding fails (like we do in many other places) and -ENOENT if there is no filesystem with that name. This is user-visible: it's propagated all the way up and reported by mount(8).

I'd rather we do something like this:

commit 2b330133e10e7f53f0b169335c3b6000782e9123

Author: Ilya Dryomov <[email protected]>
Date:   Mon Oct 16 10:32:50 2017 +0200

ceph: -EINVAL on decoding failure in ceph_mdsc_handle_fsmap()

Don't set ->mdsmap_err to -ENOENT unconditionally, and drop unneeded return statement while at it.

fs/ceph/mds_client.c +2 -2
index 51f8af685a1f..aaa8879c8098 100644
@@ -3878,14 +3878,14 @@ void ceph_mdsc_handle_fsmap(struct
 ceph_mds_client *mdsc, struct ceph_msg *msg)
                goto err_out;
        }
        return;
+
 bad:
        pr_err("error decoding fsmap\n");
 err_out:
        mutex_lock(&mdsc->mutex);
-       mdsc->mdsmap_err = -ENOENT;
+       mdsc->mdsmap_err = err;
        __wake_requests(mdsc, &mdsc->waiting_for_map);
        mutex_unlock(&mdsc->mutex);
-       return;
 }
 

/*

Quoted 3 lines

Thanks,

Ilya

Thanks very much for your thoughts, this makes sense.

Regards,
Christos