diff options
| author | Steven Whitehouse | 2006-05-25 18:40:08 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2006-05-25 18:40:08 +0200 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /fs/9p/vfs_file.c | |
| parent | [GFS2] Casts for printing 64bit numbers (diff) | |
| parent | Linux 2.6.17-rc5 (diff) | |
| download | kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.tar.gz kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.tar.xz kernel-qcow2-linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.zip | |
Merge branch 'master'
Diffstat (limited to 'fs/9p/vfs_file.c')
| -rw-r--r-- | fs/9p/vfs_file.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 083dcfcd158e..1a8e46084f0e 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -72,11 +72,17 @@ int v9fs_file_open(struct inode *inode, struct file *file) return -ENOSPC; } - err = v9fs_t_walk(v9ses, vfid->fid, fid, NULL, NULL); + err = v9fs_t_walk(v9ses, vfid->fid, fid, NULL, &fcall); if (err < 0) { dprintk(DEBUG_ERROR, "rewalk didn't work\n"); - goto put_fid; + if (fcall && fcall->id == RWALK) + goto clunk_fid; + else { + v9fs_put_idpool(fid, &v9ses->fidpool); + goto free_fcall; + } } + kfree(fcall); /* TODO: do special things for O_EXCL, O_NOFOLLOW, O_SYNC */ /* translate open mode appropriately */ @@ -109,8 +115,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) clunk_fid: v9fs_t_clunk(v9ses, fid); -put_fid: - v9fs_put_idpool(fid, &v9ses->fidpool); +free_fcall: kfree(fcall); return err; |