From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757308Ab1DOVgo (ORCPT ); Fri, 15 Apr 2011 17:36:44 -0400 Received: from kroah.org ([198.145.64.141]:52261 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757272Ab1DOVgN (ORCPT ); Fri, 15 Apr 2011 17:36:13 -0400 Date: Fri, 15 Apr 2011 14:33:09 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, Andrew Morton , torvalds@linux-foundation.org, stable@kernel.org, lwn@lwn.net Subject: Re: Linux 2.6.33.11 Message-ID: <20110415213309.GB30847@kroah.com> References: <20110415213252.GA30847@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110415213252.GA30847@kroah.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org diff --git a/Makefile b/Makefile index 7829a92..20107ca 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = .10 +EXTRAVERSION = .11 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 4810a25..1fa0f4b 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -497,14 +497,6 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs, max_pages = max(nr, max_pages); nr_pages += nr; - - /* - * nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1, - * so tot_pages cannot overflow without first going negative. - */ - if ((int)nr_pages < 0) - ret = -EINVAL; - goto out; } pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL);