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

Commit fd891454 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: remove nfsd_close 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4bd9e9b7

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -5505,7 +5505,7 @@ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct 
	__be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);

	if (!err) {

		err = nfserrno(vfs_test_lock(file, lock));

		nfsd_close(file);

		fput(file);

	}

	return err;

}

fs/nfsd/vfs.c

+5 −14
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 


	host_err = ima_file_check(file, may_flags, 0);

	if (host_err) {

		nfsd_close(file);

		fput(file);

		goto out_nfserr;

	}
@@ -761,15 +761,6 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	return err;

}



/*

 * Close a file.

 */

void

nfsd_close(struct file *filp)

{

	fput(filp);

}



/*

 * Obtain the readahead parameters for the file

 * specified by (dev, ino).
@@ -1040,7 +1031,7 @@ void nfsd_put_tmp_read_open(struct file *file, struct raparms *ra) 
		ra->p_count--;

		spin_unlock(&rab->pb_lock);

	}

	nfsd_close(file);

	fput(file);

}



/*
@@ -1093,7 +1084,7 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, 
		if (cnt)

			err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen,

					     cnt, stablep);

		nfsd_close(file);

		fput(file);

	}

out:

	return err;
@@ -1138,7 +1129,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, 
			err = nfserr_notsupp;

	}



	nfsd_close(file);

	fput(file);

out:

	return err;

}
@@ -1977,7 +1968,7 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp, 
	if (err == nfserr_eof || err == nfserr_toosmall)

		err = nfs_ok; /* can still be found in ->err */

out_close:

	nfsd_close(file);

	fput(file);

out:

	return err;

}

fs/nfsd/vfs.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ __be32 nfsd_commit(struct svc_rqst *, struct svc_fh *, 
#endif /* CONFIG_NFSD_V3 */

__be32		nfsd_open(struct svc_rqst *, struct svc_fh *, umode_t,

				int, struct file **);

void		nfsd_close(struct file *);

struct raparms;

__be32		nfsd_get_tmp_read_open(struct svc_rqst *, struct svc_fh *,

				struct file **, struct raparms **);