aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-01-05 15:38:41 -0500
committerJ. Bruce Fields <bfields@redhat.com>2012-01-05 15:38:41 -0500
commit7a6ef8c72314f254c107c6a9ed7cb201961ee05a (patch)
treee66c90f2f1e8121764516c0d49c18e6d054de63c /fs/nfsd
parent9b4146e85536ebd6b989f43906986e34486efdba (diff)
nfsd4: nfsd4_create_clid_dir return value is unused
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4recover.c10
-rw-r--r--fs/nfsd/state.h2
2 files changed, 5 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index eb01fffdc2f1..a52f267f122a 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -117,8 +117,7 @@ out_no_tfm:
117 return status; 117 return status;
118} 118}
119 119
120int 120void nfsd4_create_clid_dir(struct nfs4_client *clp)
121nfsd4_create_clid_dir(struct nfs4_client *clp)
122{ 121{
123 const struct cred *original_cred; 122 const struct cred *original_cred;
124 char *dname = clp->cl_recdir; 123 char *dname = clp->cl_recdir;
@@ -128,13 +127,13 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)
128 dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname); 127 dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname);
129 128
130 if (clp->cl_firststate) 129 if (clp->cl_firststate)
131 return 0; 130 return;
132 clp->cl_firststate = 1; 131 clp->cl_firststate = 1;
133 if (!rec_file) 132 if (!rec_file)
134 return -ENOENT; 133 return;
135 status = nfs4_save_creds(&original_cred); 134 status = nfs4_save_creds(&original_cred);
136 if (status < 0) 135 if (status < 0)
137 return status; 136 return;
138 137
139 dir = rec_file->f_path.dentry; 138 dir = rec_file->f_path.dentry;
140 /* lock the parent */ 139 /* lock the parent */
@@ -172,7 +171,6 @@ out_unlock:
172 " and is writeable", status, 171 " and is writeable", status,
173 user_recovery_dirname); 172 user_recovery_dirname);
174 nfs4_reset_creds(original_cred); 173 nfs4_reset_creds(original_cred);
175 return status;
176} 174}
177 175
178typedef int (recdir_func)(struct dentry *, struct dentry *); 176typedef int (recdir_func)(struct dentry *, struct dentry *);
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 89c2cd84d796..ffb5df1db94f 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -483,7 +483,7 @@ extern void nfsd4_shutdown_recdir(void);
483extern int nfs4_client_to_reclaim(const char *name); 483extern int nfs4_client_to_reclaim(const char *name);
484extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id); 484extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
485extern void nfsd4_recdir_purge_old(void); 485extern void nfsd4_recdir_purge_old(void);
486extern int nfsd4_create_clid_dir(struct nfs4_client *clp); 486extern void nfsd4_create_clid_dir(struct nfs4_client *clp);
487extern void nfsd4_remove_clid_dir(struct nfs4_client *clp); 487extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
488extern void release_session_client(struct nfsd4_session *); 488extern void release_session_client(struct nfsd4_session *);
489extern __be32 nfs4_validate_stateid(struct nfs4_client *, stateid_t *); 489extern __be32 nfs4_validate_stateid(struct nfs4_client *, stateid_t *);