diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 10:11:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 10:11:38 -0700 |
| commit | 14c1b7c212de7c7c9231d5a676eb96f28c088338 (patch) | |
| tree | 13085d717d706db544b57be348820501bc670db9 /fs | |
| parent | 4806626782b4408e468ef686229556899be345c8 (diff) | |
| parent | 033a666ccb842ab4134fcd0c861d5ba9f5d6bf3a (diff) | |
| download | blackbird-op-linux-14c1b7c212de7c7c9231d5a676eb96f28c088338.tar.gz blackbird-op-linux-14c1b7c212de7c7c9231d5a676eb96f28c088338.zip | |
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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 4145083dcf88..23341c1063bc 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -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 |
