lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drbd: Silenced an assert

Browse Source 
That assertion's condition needed adjustment for today's semantics

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner
2010-10-21 17:21:19 +02:00
parent fb2c7a10ee
commit 8825f7c3e5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_req.c
View File

@@ -258,7 +258,7 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
if (!hlist_unhashed(&req->colision)) if (!hlist_unhashed(&req->colision))
hlist_del(&req->colision); hlist_del(&req->colision);
else else
D_ASSERT((s & RQ_NET_MASK) == 0); D_ASSERT((s & (RQ_NET_MASK & ~RQ_NET_DONE)) == 0);
/* for writes we need to do some extra housekeeping */ /* for writes we need to do some extra housekeeping */
if (rw == WRITE) if (rw == WRITE)

2
include/linux/drbd.h
View File

@@ -53,7 +53,7 @@
extern const char *drbd_buildtag(void); extern const char *drbd_buildtag(void);
#define REL_VERSION "8.3.9rc2" #define REL_VERSION "8.3.9"
#define API_VERSION 88 #define API_VERSION 88
#define PRO_VERSION_MIN 86 #define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 95 #define PRO_VERSION_MAX 95