From e172ad348ba1f10a58391b54693285000499feeb Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Sat, 26 Mar 2011 19:29:34 +0100 Subject: [PATCH] --- yaml --- r: 243538 b: refs/heads/master c: 6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b96e49026b27..8a503844d227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef550f6f4f6c9345a27ec85d98f4f7de1adce79c +refs/heads/master: 6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index 02212ed50852..b6776cb627cc 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -1602,11 +1602,11 @@ void handle_watch_notify(struct ceph_osd_client *osdc, struct ceph_msg *msg) cookie, ver, event); if (event) { event_work = kmalloc(sizeof(*event_work), GFP_NOIO); - INIT_WORK(&event_work->work, do_event_work); if (!event_work) { dout("ERROR: could not allocate event_work\n"); goto done_err; } + INIT_WORK(&event_work->work, do_event_work); event_work->event = event; event_work->ver = ver; event_work->notify_id = notify_id;