Message-ID: <4DDA66F6.1050109@panasas.com>
Date: Mon, 23 May 2011 16:53:58 +0300
From: Benny Halevy <bhalevy@panasas.com>
To: Boaz Harrosh <bharrosh@panasas.com>
CC: Trond Myklebust <Trond.Myklebust@netapp.com>, linux-nfs@vger.kernel.org
Subject: Re: [PTACH] SQUASHME: pnfs-obj: Important fallout from the last rebase
References: <4DD99F9B.2040406@panasas.com> <1306108883-29089-1-git-send-email-bhalevy@panasas.com> <4DDA3AA4.8000205@panasas.com>
In-Reply-To: <4DDA3AA4.8000205@panasas.com>
Content-Type: text/plain; charset=UTF-8
Sender: linux-nfs-owner@vger.kernel.org
MIME-Version: 1.0

On 2011-05-23 13:44, Boaz Harrosh wrote:
> 
> 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

I agree that in the current implementation the ld must implement
pg_test for pnfs to work.
This patch is reverse though...

Benny

> 
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
> ---
> 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)