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

Commit 999448a8 authored by Bernd Schubert's avatar Bernd Schubert Committed by Theodore Ts'o
Browse files

nfsd: rename 'int access' to 'int may_flags' in nfsd_open() 



Just rename this variable, as the next patch will add a flag and
'access' as variable name would not be correct any more.

Signed-off-by: default avatarBernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Acked-by: default avatarJ. Bruce <Fields&lt;bfields@redhat.com>
parent d1f5273e

fs/nfsd/vfs.c

+10 −8
Original line number Diff line number Diff line
@@ -737,12 +737,13 @@ static int nfsd_open_break_lease(struct inode *inode, int access) 


/*

 * Open an existing file or directory.

 * The access argument indicates the type of open (read/write/lock)

 * The may_flags argument indicates the type of open (read/write/lock)

 * and additional flags.

 * N.B. After this call fhp needs an fh_put

 */

__be32

nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,

			int access, struct file **filp)

			int may_flags, struct file **filp)

{

	struct dentry	*dentry;

	struct inode	*inode;
@@ -757,7 +758,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	 * and (hopefully) checked permission - so allow OWNER_OVERRIDE

	 * in case a chmod has now revoked permission.

	 */

	err = fh_verify(rqstp, fhp, type, access | NFSD_MAY_OWNER_OVERRIDE);

	err = fh_verify(rqstp, fhp, type, may_flags | NFSD_MAY_OWNER_OVERRIDE);

	if (err)

		goto out;
@@ -768,7 +769,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	 * or any access when mandatory locking enabled

	 */

	err = nfserr_perm;

	if (IS_APPEND(inode) && (access & NFSD_MAY_WRITE))

	if (IS_APPEND(inode) && (may_flags & NFSD_MAY_WRITE))

		goto out;

	/*

	 * We must ignore files (but only files) which might have mandatory
@@ -781,12 +782,12 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	if (!inode->i_fop)

		goto out;



	host_err = nfsd_open_break_lease(inode, access);

	host_err = nfsd_open_break_lease(inode, may_flags);

	if (host_err) /* NOMEM or WOULDBLOCK */

		goto out_nfserr;



	if (access & NFSD_MAY_WRITE) {

		if (access & NFSD_MAY_READ)

	if (may_flags & NFSD_MAY_WRITE) {

		if (may_flags & NFSD_MAY_READ)

			flags = O_RDWR|O_LARGEFILE;

		else

			flags = O_WRONLY|O_LARGEFILE;
@@ -796,7 +797,8 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 
	if (IS_ERR(*filp))

		host_err = PTR_ERR(*filp);

	else

		host_err = ima_file_check(*filp, access);

		host_err = ima_file_check(*filp, may_flags);



out_nfserr:

	err = nfserrno(host_err);

out: