Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10afec90 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9c9cc93a

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void nfs_return_all_delegations(struct super_block *sb) 
	spin_unlock(&clp->cl_lock);

}



int nfs_do_expire_all_delegations(void *ptr)

static int nfs_do_expire_all_delegations(void *ptr)

{

	struct nfs_client *clp = ptr;

	struct nfs_delegation *delegation;

fs/nfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	return res;

}



loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)

static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)

{

	mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);

	switch (origin) {
@@ -633,7 +633,7 @@ loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 
 * All directory operations under NFS are synchronous, so fsync()

 * is a dummy operation.

 */

int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)

static int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)

{

	dfprintk(VFS, "NFS: fsync_dir(%s/%s) datasync %d\n",

			dentry->d_parent->d_name.name, dentry->d_name.name,

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static int _nfs4_do_access(struct inode *inode, struct rpc_cred *cred, int openf 
	return -EACCES;

}



int nfs4_recover_expired_lease(struct nfs_server *server)

static int nfs4_recover_expired_lease(struct nfs_server *server)

{

	struct nfs_client *clp = server->nfs_client;

	int ret;
@@ -2748,7 +2748,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) 
/* This is the error handling routine for processes that are allowed

 * to sleep.

 */

int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception)

static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct nfs4_exception *exception)

{

	struct nfs_client *clp = server->nfs_client;

	int ret = errorcode;

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct rpc_cred *nfs4_get_renew_cred(struct nfs_client *clp) 
	return cred;

}



struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)

static struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)

{

	struct nfs4_state_owner *sp;

fs/nfs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct nfs_write_data *nfs_commit_alloc(void) 
	return p;

}



void nfs_commit_rcu_free(struct rcu_head *head)

static void nfs_commit_rcu_free(struct rcu_head *head)

{

	struct nfs_write_data *p = container_of(head, struct nfs_write_data, task.u.tk_rcu);

	if (p && (p->pagevec != &p->page_array[0]))
@@ -922,7 +922,7 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, unsigned i 
	return 0;

 out_bad:

	while (!list_empty(head)) {

		struct nfs_page *req = nfs_list_entry(head->next);

		req = nfs_list_entry(head->next);

		nfs_list_remove_request(req);

		nfs_redirty_request(req);

		nfs_end_page_writeback(req->wb_page);