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()
This commit is contained in:
Коммит
14c1b7c212
|
@ -678,7 +678,6 @@ __be32
|
|||
nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
|
||||
int access, struct file **filp)
|
||||
{
|
||||
const struct cred *cred = current_cred();
|
||||
struct dentry *dentry;
|
||||
struct inode *inode;
|
||||
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);
|
||||
}
|
||||
*filp = dentry_open(dget(dentry), mntget(fhp->fh_export->ex_path.mnt),
|
||||
flags, cred);
|
||||
flags, current_cred());
|
||||
if (IS_ERR(*filp))
|
||||
host_err = PTR_ERR(*filp);
|
||||
else
|
||||
|
|
Загрузка…
Ссылка в новой задаче