All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] NFS: Fix O_DIRECT compile warnings
@ 2012-05-04 18:09 Trond Myklebust
  2012-05-04 18:09 ` [PATCH 2/2] NFS: Fix sparse warnings Trond Myklebust
  2012-05-07  0:13 ` [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Stephen Rothwell
  0 siblings, 2 replies; 4+ messages in thread
From: Trond Myklebust @ 2012-05-04 18:09 UTC (permalink / raw)
  To: linux-nfs; +Cc: Fred Isaman, Stephen Rothwell

Fix the following compile warnings:
fs/nfs/direct.c: In function 'nfs_direct_read_schedule_segment':
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:352:27: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c: In function 'nfs_direct_write_schedule_segment':
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
lacks a cast [enabled by default]
fs/nfs/direct.c:650:27: warning: comparison of distinct pointer types
lacks a cast [enabled by default]

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/nfs/direct.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index aab3016..dca9c81 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -322,7 +322,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de
 		int i;
 
 		pgbase = user_addr & ~PAGE_MASK;
-		bytes = min(max(rsize, PAGE_SIZE), count);
+		bytes = min(max_t(size_t, rsize, PAGE_SIZE), count);
 
 		result = -ENOMEM;
 		npages = nfs_page_array_len(pgbase, bytes);
@@ -349,7 +349,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de
 
 		for (i = 0; i < npages; i++) {
 			struct nfs_page *req;
-			unsigned int req_len = min(bytes, PAGE_SIZE - pgbase);
+			unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
 			/* XXX do we need to do the eof zeroing found in async_filler? */
 			req = nfs_create_request(dreq->ctx, dreq->inode,
 						 pagevec[i],
@@ -619,7 +619,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
 		int i;
 
 		pgbase = user_addr & ~PAGE_MASK;
-		bytes = min(max(wsize, PAGE_SIZE), count);
+		bytes = min(max_t(size_t, wsize, PAGE_SIZE), count);
 
 		result = -ENOMEM;
 		npages = nfs_page_array_len(pgbase, bytes);
@@ -647,7 +647,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
 
 		for (i = 0; i < npages; i++) {
 			struct nfs_page *req;
-			unsigned int req_len = min(bytes, PAGE_SIZE - pgbase);
+			unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
 
 			req = nfs_create_request(dreq->ctx, dreq->inode,
 						 pagevec[i],
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] NFS: Fix sparse warnings
  2012-05-04 18:09 [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Trond Myklebust
@ 2012-05-04 18:09 ` Trond Myklebust
  2012-05-04 18:56   ` Boaz Harrosh
  2012-05-07  0:13 ` [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Stephen Rothwell
  1 sibling, 1 reply; 4+ messages in thread
From: Trond Myklebust @ 2012-05-04 18:09 UTC (permalink / raw)
  To: linux-nfs; +Cc: Fred Isaman, Boaz Harrosh

Fix the following sparse warnings:

fs/nfs/direct.c:221:6: warning: symbol 'nfs_direct_readpage_release' was
not declared. Should it be static?
fs/nfs/read.c:38:43: warning: non-ANSI function declaration of function
'nfs_readhdr_alloc'
fs/nfs/objlayout/objio_osd.c:214:5: warning: symbol '__alloc_objio_seg'
was not declared. Should it be static?

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
Cc: Boaz Harrosh <bharrosh@panasas.com>
---
 fs/nfs/direct.c              |    2 +-
 fs/nfs/objlayout/objio_osd.c |    2 +-
 fs/nfs/read.c                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index dca9c81..257d009 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -218,7 +218,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)
 	nfs_direct_req_release(dreq);
 }
 
-void nfs_direct_readpage_release(struct nfs_page *req)
+static void nfs_direct_readpage_release(struct nfs_page *req)
 {
 	dprintk("NFS: direct read done (%s/%lld %d@%lld)\n",
 		req->wb_context->dentry->d_inode->i_sb->s_id,
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index fbf4874..b47277b 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -211,7 +211,7 @@ static void copy_single_comp(struct ore_components *oc, unsigned c,
 	memcpy(ocomp->cred, src_comp->oc_cap.cred, sizeof(ocomp->cred));
 }
 
-int __alloc_objio_seg(unsigned numdevs, gfp_t gfp_flags,
+static int __alloc_objio_seg(unsigned numdevs, gfp_t gfp_flags,
 		       struct objio_segment **pseg)
 {
 /*	This is the in memory structure of the objio_segment
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 37c9eb2..f23cf25 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -35,7 +35,7 @@ static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;
 
 static struct kmem_cache *nfs_rdata_cachep;
 
-struct nfs_read_header *nfs_readhdr_alloc()
+struct nfs_read_header *nfs_readhdr_alloc(void)
 {
 	struct nfs_read_header *rhdr;
 
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] NFS: Fix sparse warnings
  2012-05-04 18:09 ` [PATCH 2/2] NFS: Fix sparse warnings Trond Myklebust
@ 2012-05-04 18:56   ` Boaz Harrosh
  0 siblings, 0 replies; 4+ messages in thread
From: Boaz Harrosh @ 2012-05-04 18:56 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: linux-nfs, Fred Isaman

On 05/04/2012 09:09 PM, Trond Myklebust wrote:

> Fix the following sparse warnings:
> 
> fs/nfs/direct.c:221:6: warning: symbol 'nfs_direct_readpage_release' was
> not declared. Should it be static?
> fs/nfs/read.c:38:43: warning: non-ANSI function declaration of function
> 'nfs_readhdr_alloc'
> fs/nfs/objlayout/objio_osd.c:214:5: warning: symbol '__alloc_objio_seg'
> was not declared. Should it be static?
> 
> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
> Cc: Fred Isaman <iisaman@netapp.com>
> Cc: Boaz Harrosh <bharrosh@panasas.com>
> ---
>  fs/nfs/direct.c              |    2 +-
>  fs/nfs/objlayout/objio_osd.c |    2 +-
>  fs/nfs/read.c                |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
> index dca9c81..257d009 100644
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@ -218,7 +218,7 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)
>  	nfs_direct_req_release(dreq);
>  }
>  
> -void nfs_direct_readpage_release(struct nfs_page *req)
> +static void nfs_direct_readpage_release(struct nfs_page *req)
>  {
>  	dprintk("NFS: direct read done (%s/%lld %d@%lld)\n",
>  		req->wb_context->dentry->d_inode->i_sb->s_id,
> diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
> index fbf4874..b47277b 100644
> --- a/fs/nfs/objlayout/objio_osd.c
> +++ b/fs/nfs/objlayout/objio_osd.c
> @@ -211,7 +211,7 @@ static void copy_single_comp(struct ore_components *oc, unsigned c,
>  	memcpy(ocomp->cred, src_comp->oc_cap.cred, sizeof(ocomp->cred));
>  }
>  
> -int __alloc_objio_seg(unsigned numdevs, gfp_t gfp_flags,
> +static int __alloc_objio_seg(unsigned numdevs, gfp_t gfp_flags,
>  		       struct objio_segment **pseg)
>  {


Thanks!

Stupid compiler "can't you see the '__' of course it's static" ;-)

I hope that's the last one of that.

Boaz

>  /*	This is the in memory structure of the objio_segment
> diff --git a/fs/nfs/read.c b/fs/nfs/read.c
> index 37c9eb2..f23cf25 100644
> --- a/fs/nfs/read.c
> +++ b/fs/nfs/read.c
> @@ -35,7 +35,7 @@ static const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;
>  
>  static struct kmem_cache *nfs_rdata_cachep;
>  
> -struct nfs_read_header *nfs_readhdr_alloc()
> +struct nfs_read_header *nfs_readhdr_alloc(void)
>  {
>  	struct nfs_read_header *rhdr;
>  



^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] NFS: Fix O_DIRECT compile warnings
  2012-05-04 18:09 [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Trond Myklebust
  2012-05-04 18:09 ` [PATCH 2/2] NFS: Fix sparse warnings Trond Myklebust
@ 2012-05-07  0:13 ` Stephen Rothwell
  1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2012-05-07  0:13 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: linux-nfs, Fred Isaman

[-- Attachment #1: Type: text/plain, Size: 1554 bytes --]

Hi Trond,

On Fri,  4 May 2012 14:09:18 -0400 Trond Myklebust <Trond.Myklebust@netapp.com> wrote:
>
> Fix the following compile warnings:
> fs/nfs/direct.c: In function 'nfs_direct_read_schedule_segment':
> fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:325:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:352:27: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c: In function 'nfs_direct_write_schedule_segment':
> fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:622:11: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> fs/nfs/direct.c:650:27: warning: comparison of distinct pointer types
> lacks a cast [enabled by default]
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
> Cc: Fred Isaman <iisaman@netapp.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>

That works for me.

Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-07  0:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-04 18:09 [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Trond Myklebust
2012-05-04 18:09 ` [PATCH 2/2] NFS: Fix sparse warnings Trond Myklebust
2012-05-04 18:56   ` Boaz Harrosh
2012-05-07  0:13 ` [PATCH 1/2] NFS: Fix O_DIRECT compile warnings Stephen Rothwell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.