From patchwork Mon May 23 10:44:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 808182 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4NAjWN6020847 for ; Mon, 23 May 2011 10:45:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752039Ab1EWKpQ (ORCPT ); Mon, 23 May 2011 06:45:16 -0400 Received: from daytona.panasas.com ([67.152.220.89]:53579 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707Ab1EWKpN (ORCPT ); Mon, 23 May 2011 06:45:13 -0400 Received: from fs2.bhalevy.com ([172.17.33.65]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 23 May 2011 06:45:11 -0400 Message-ID: <4DDA3AA4.8000205@panasas.com> Date: Mon, 23 May 2011 13:44:52 +0300 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110430 Remi/fc12 Thunderbird/3.1.10 MIME-Version: 1.0 To: Benny Halevy CC: Trond Myklebust , linux-nfs@vger.kernel.org Subject: [PTACH] SQUASHME: pnfs-obj: Important fallout from the last rebase References: <4DD99F9B.2040406@panasas.com> <1306108883-29089-1-git-send-email-bhalevy@panasas.com> In-Reply-To: <1306108883-29089-1-git-send-email-bhalevy@panasas.com> X-OriginalArrivalTime: 23 May 2011 10:45:11.0659 (UTC) FILETIME=[7DCFA3B0:01CC1936] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 23 May 2011 10:45:32 +0000 (UTC) On the last rebase I dropped this hunk it needs to go into the: [PATCH v5 31/38] pnfs-obj: osd raid engine read/write implementation With out this the code does not work Signed-off-by: Boaz Harrosh --- -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index 105d8a6..74b5d3f 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -989,19 +990,6 @@ ssize_t objio_write_pagelist(struct objlayout_io_state *ol_state, bool stable) return _write_exec(ios); } -/* - * objlayout_pg_test(). Called by nfs_can_coalesce_requests() - * - * return 1 : coalesce page - * return 0 : don't coalesce page - */ -int -objlayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, - struct nfs_page *req) -{ - return 1; -} - static struct pnfs_layoutdriver_type objlayout_type = { .id = LAYOUT_OSD2_OBJECTS, .name = "LAYOUT_OSD2_OBJECTS", @@ -1021,8 +1009,6 @@ static struct pnfs_layoutdriver_type objlayout_type = { .encode_layoutcommit = objlayout_encode_layoutcommit, .encode_layoutreturn = objlayout_encode_layoutreturn, - - .pg_test = objlayout_pg_test, }; void *objio_init_mt(void)