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

Commit 7a6ef8c7 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: nfsd4_create_clid_dir return value is unused 



Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 9b4146e8

fs/nfsd/nfs4recover.c

+4 −6
Original line number Diff line number Diff line
@@ -117,8 +117,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) 
	return status;

}



int

nfsd4_create_clid_dir(struct nfs4_client *clp)

void nfsd4_create_clid_dir(struct nfs4_client *clp)

{

	const struct cred *original_cred;

	char *dname = clp->cl_recdir;
@@ -128,13 +127,13 @@ nfsd4_create_clid_dir(struct nfs4_client *clp) 
	dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname);



	if (clp->cl_firststate)

		return 0;

		return;

	clp->cl_firststate = 1;

	if (!rec_file)

		return -ENOENT;

		return;

	status = nfs4_save_creds(&original_cred);

	if (status < 0)

		return status;

		return;



	dir = rec_file->f_path.dentry;

	/* lock the parent */
@@ -172,7 +171,6 @@ nfsd4_create_clid_dir(struct nfs4_client *clp) 
				" and is writeable", status,

				user_recovery_dirname);

	nfs4_reset_creds(original_cred);

	return status;

}



typedef int (recdir_func)(struct dentry *, struct dentry *);

fs/nfsd/state.h

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ extern void nfsd4_shutdown_recdir(void); 
extern int nfs4_client_to_reclaim(const char *name);

extern int nfs4_has_reclaimed_state(const char *name, bool use_exchange_id);

extern void nfsd4_recdir_purge_old(void);

extern int nfsd4_create_clid_dir(struct nfs4_client *clp);

extern void nfsd4_create_clid_dir(struct nfs4_client *clp);

extern void nfsd4_remove_clid_dir(struct nfs4_client *clp);

extern void release_session_client(struct nfsd4_session *);

extern __be32 nfs4_validate_stateid(struct nfs4_client *, stateid_t *);