[sheepdog] [PATCH] lib/shared: fix warning in alloc_request()

Hitoshi Mitake mitake.hitoshi at lab.ntt.co.jp
Mon Apr 20 04:05:55 CEST 2015


At Sat, 18 Apr 2015 16:09:00 +0800,
Yu Yang wrote:
> 
> From: Yu Yang <yuyang at cmss.chinamobile.com>
> 
> There is a warning in vdi.c:
> shared/vdi.c:120:39: warning: declaration of 'write' shadows a global declaration [-Wshadow]
> Change write to iswrite.
> 
> Signed-off-by: Yu Yang <yuyang at cmss.chinamobile.com>
> ---
>  lib/shared/vdi.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.
Hitoshi

> 
> diff --git a/lib/shared/vdi.c b/lib/shared/vdi.c
> index d40bd4b..39b8acb 100644
> --- a/lib/shared/vdi.c
> +++ b/lib/shared/vdi.c
> @@ -117,7 +117,7 @@ static void free_request(struct sd_request *req)
>  }
>  
>  static struct sd_request *alloc_request(struct sd_vdi *vdi, void *buf,
> -					size_t count, off_t offset, bool write)
> +			size_t count, off_t offset, bool iswrite)
>  {
>  	struct sd_request *req;
>  	int fd;
> @@ -130,7 +130,7 @@ static struct sd_request *alloc_request(struct sd_vdi *vdi, void *buf,
>  	req->data = buf;
>  	req->length = count;
>  	req->offset = offset;
> -	req->write = write;
> +	req->write = iswrite;
>  	INIT_LIST_NODE(&req->list);
>  	req->vdi = vdi;
>  
> -- 
> 1.7.9.5
> 
> -- 
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> https://lists.wpkg.org/mailman/listinfo/sheepdog



More information about the sheepdog mailing list