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

Commit 14c1b7c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.31' of git://linux-nfs.org/~bfields/linux:
  NFSD: Don't hold unrefcounted creds over call to nfsd_setuser()
parents 48066267 033a666c

fs/nfsd/vfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -678,7 +678,6 @@ __be32 
nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,

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

			int access, struct file **filp)

			int access, struct file **filp)

{

{

	const struct cred *cred = current_cred();

	struct dentry	*dentry;

	struct dentry	*dentry;

	struct inode	*inode;

	struct inode	*inode;

	int		flags = O_RDONLY|O_LARGEFILE;

	int		flags = O_RDONLY|O_LARGEFILE;
@@ -733,7 +732,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, 
		vfs_dq_init(inode);

		vfs_dq_init(inode);

	}

	}

	*filp = dentry_open(dget(dentry), mntget(fhp->fh_export->ex_path.mnt),

	*filp = dentry_open(dget(dentry), mntget(fhp->fh_export->ex_path.mnt),

			    flags, cred);

			    flags, current_cred());

	if (IS_ERR(*filp))

	if (IS_ERR(*filp))

		host_err = PTR_ERR(*filp);

		host_err = PTR_ERR(*filp);

	else

	else