From f2b168c7f49dc41cd5c725e7c3955ff3d4c1a4b1 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 4 May 2012 13:54:24 -0400
Subject: [PATCH] --- yaml --- r: 308589 b: refs/heads/master c:
 1385b8117325e79f74c1e7d1cbf45c789deb85c5 h: refs/heads/master i:   308587:
 07b30d9a274f8427ba71276df4b0675fb4e30756 v: v3

---
 [refs]                             | 2 +-
 trunk/fs/nfs/direct.c              | 2 +-
 trunk/fs/nfs/objlayout/objio_osd.c | 2 +-
 trunk/fs/nfs/read.c                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 257f7267b542..4b00690a00e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5fc4028ef751904a114ffc4b5d2cd9f0233142
+refs/heads/master: 1385b8117325e79f74c1e7d1cbf45c789deb85c5
diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c
index dca9c8143009..257d0091148b 100644
--- a/trunk/fs/nfs/direct.c
+++ b/trunk/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/trunk/fs/nfs/objlayout/objio_osd.c b/trunk/fs/nfs/objlayout/objio_osd.c
index fbf4874ec252..b47277baebab 100644
--- a/trunk/fs/nfs/objlayout/objio_osd.c
+++ b/trunk/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/trunk/fs/nfs/read.c b/trunk/fs/nfs/read.c
index 37c9eb2930b0..f23cf255bd39 100644
--- a/trunk/fs/nfs/read.c
+++ b/trunk/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;