diff --git a/[refs] b/[refs] index 38d222b6a476..b3ecc32d6e67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37867ae7c549c58d44337e27738577ed8b7cd753 +refs/heads/master: fca51d64c5baf64604bc1edc5c5f0e7ed176322f diff --git a/trunk/block/blk-iopoll.c b/trunk/block/blk-iopoll.c index 0671d4614b08..b9b32652292c 100644 --- a/trunk/block/blk-iopoll.c +++ b/trunk/block/blk-iopoll.c @@ -115,9 +115,12 @@ static void blk_iopoll_softirq(struct softirq_action *h) local_irq_disable(); - /* Drivers must not modify the NAPI state if they - * consume the entire weight. In such cases this code - * still "owns" the NAPI instance and therefore can + /* + * Drivers must not modify the iopoll state, if they + * consume their assigned weight (or more, some drivers can't + * easily just stop processing, they have to complete an + * entire mask of commands).In such cases this code + * still "owns" the iopoll instance and therefore can * move the instance around on the list at-will. */ if (work >= weight) {