summaryrefslogtreecommitdiff
path: root/fs/ceph/osd_client.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-11-21 16:53:16 +0100
committerSage Weil <sage@newdream.net>2009-11-21 13:05:16 -0800
commit32c895e776a0dd2cb701d60fbd6440280c09ce35 (patch)
tree75229f8dc990d6e352a2c97ccefc20307c1ab52e /fs/ceph/osd_client.c
parent60d877334f7d9f5f2417ea4a83c1def769286102 (diff)
fs/ceph: Move a dereference below a NULL test
If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/). // <smpl> @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/osd_client.c')
-rw-r--r--fs/ceph/osd_client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index d63f192999ee..5d30d5959b97 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -1249,11 +1249,12 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)
{
struct ceph_osd *osd = con->private;
- struct ceph_osd_client *osdc = osd->o_osdc;
+ struct ceph_osd_client *osdc;
int type = le16_to_cpu(msg->hdr.type);
if (!osd)
return;
+ osdc = osd->o_osdc;
switch (type) {
case CEPH_MSG_OSD_MAP: