Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 10afec9081fee7e48995fa396fba22c7de4b99d4

Authored by Trond Myklebust
1 parent 9c9cc93ad2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NFS: Fix some 'sparse' warnings... 

- fs/nfs/dir.c:610:8: warning: symbol 'nfs_llseek_dir' was not declared.
   Should it be static?
 - fs/nfs/dir.c:636:5: warning: symbol 'nfs_fsync_dir' was not declared.
   Should it be static?
 - fs/nfs/write.c:925:19: warning: symbol 'req' shadows an earlier one
 - fs/nfs/write.c:61:6: warning: symbol 'nfs_commit_rcu_free' was not
   declared. Should it be static?
 - fs/nfs/nfs4proc.c:793:5: warning: symbol 'nfs4_recover_expired_lease'
   was not declared. Should it be static?

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 5 changed files with 8 additions and 8 deletions Side-by-side Diff

... ... @@ -226,7 +226,7 @@
226 226 spin_unlock(&clp->cl_lock);
227 227 }
228 228  
229   -int nfs_do_expire_all_delegations(void *ptr)
  229 +static int nfs_do_expire_all_delegations(void *ptr)
230 230 {
231 231 struct nfs_client *clp = ptr;
232 232 struct nfs_delegation *delegation;
... ... @@ -607,7 +607,7 @@
607 607 return res;
608 608 }
609 609  
610   -loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
  610 +static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
611 611 {
612 612 mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);
613 613 switch (origin) {
... ... @@ -633,7 +633,7 @@
633 633 * All directory operations under NFS are synchronous, so fsync()
634 634 * is a dummy operation.
635 635 */
636   -int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
  636 +static int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
637 637 {
638 638 dfprintk(VFS, "NFS: fsync_dir(%s/%s) datasync %d\n",
639 639 dentry->d_parent->d_name.name, dentry->d_name.name,
... ... @@ -790,7 +790,7 @@
790 790 return -EACCES;
791 791 }
792 792  
793   -int nfs4_recover_expired_lease(struct nfs_server *server)
  793 +static int nfs4_recover_expired_lease(struct nfs_server *server)
794 794 {
795 795 struct nfs_client *clp = server->nfs_client;
796 796 int ret;
... ... @@ -2748,7 +2748,7 @@
2748 2748 /* This is the error handling routine for processes that are allowed
2749 2749 * to sleep.
2750 2750 */
2751   -int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception)
  2751 +static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception)
2752 2752 {
2753 2753 struct nfs_client *clp = server->nfs_client;
2754 2754 int ret = errorcode;
... ... @@ -104,7 +104,7 @@
104 104 return cred;
105 105 }
106 106  
107   -struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)
  107 +static struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)
108 108 {
109 109 struct nfs4_state_owner *sp;
110 110  
... ... @@ -58,7 +58,7 @@
58 58 return p;
59 59 }
60 60  
61   -void nfs_commit_rcu_free(struct rcu_head *head)
  61 +static void nfs_commit_rcu_free(struct rcu_head *head)
62 62 {
63 63 struct nfs_write_data *p = container_of(head, struct nfs_write_data, task.u.tk_rcu);
64 64 if (p && (p->pagevec != &p->page_array[0]))
... ... @@ -922,7 +922,7 @@
922 922 return 0;
923 923 out_bad:
924 924 while (!list_empty(head)) {
925   - struct nfs_page *req = nfs_list_entry(head->next);
  925 + req = nfs_list_entry(head->next);
926 926 nfs_list_remove_request(req);
927 927 nfs_redirty_request(req);
928 928 nfs_end_page_writeback(req->wb_page);