Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7a6ef8c72314f254c107c6a9ed7cb201961ee05a

Authored by J. Bruce Fields
1 parent 9b4146e855
Exists in master and in 6 other branches 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

nfsd4: nfsd4_create_clid_dir return value is unused 

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

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

fs/nfsd/nfs4recover.c
Diff comments   View file @ 7a6ef8c
... ... @@ -117,8 +117,7 @@
117 117 return status;
118 118 }
119 119  
120   -int
121   -nfsd4_create_clid_dir(struct nfs4_client *clp)
  120 +void nfsd4_create_clid_dir(struct nfs4_client *clp)
122 121 {
123 122 const struct cred *original_cred;
124 123 char *dname = clp->cl_recdir;
125 124  
126 125  
... ... @@ -128,13 +127,13 @@
128 127 dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname);
129 128  
130 129 if (clp->cl_firststate)
131   - return 0;
  130 + return;
132 131 clp->cl_firststate = 1;
133 132 if (!rec_file)
134   - return -ENOENT;
  133 + return;
135 134 status = nfs4_save_creds(&original_cred);
136 135 if (status < 0)
137   - return status;
  136 + return;
138 137  
139 138 dir = rec_file->f_path.dentry;
140 139 /* lock the parent */
... ... @@ -172,7 +171,6 @@
172 171 " and is writeable", status,
173 172 user_recovery_dirname);
174 173 nfs4_reset_creds(original_cred);
175   - return status;
176 174 }
177 175  
178 176 typedef int (recdir_func)(struct dentry *, struct dentry *);
... ... @@ -483,7 +483,7 @@
483 483 extern int nfs4_client_to_reclaim(const char *name);
484 484 extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);
485 485 extern void nfsd4_recdir_purge_old(void);
486   -extern int nfsd4_create_clid_dir(struct nfs4_client *clp);
  486 +extern void nfsd4_create_clid_dir(struct nfs4_client *clp);
487 487 extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);
488 488 extern void release_session_client(struct nfsd4_session *);
489 489 extern __be32 nfs4_validate_stateid(struct nfs4_client *, stateid_t *);