diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 15:33:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 15:33:50 -0700 |
| commit | 7a528159b93bc52c14aedff55d53e741227fc846 (patch) | |
| tree | 742e5b26440ef2c253d543a2b0a4bed8d3496f1e /fs | |
| parent | fb478da5ba69ecf40729ae8ab37ca406b1e5be48 (diff) | |
| parent | 16ec4700127d479143c77fd9128dfa17ab572963 (diff) | |
| download | lwn-7a528159b93bc52c14aedff55d53e741227fc846.tar.gz lwn-7a528159b93bc52c14aedff55d53e741227fc846.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix put_data error handling
9p: use an IS_ERR test rather than a NULL test
9p: introduce missing kfree
9p-trans_fd: fix and clean up module init/exit paths
9p-trans_fd: don't do fs segment mangling in p9_fd_poll()
9p-trans_fd: clean up p9_conn_create()
9p-trans_fd: fix trans_fd::p9_conn_destroy()
9p: implement proper trans module refcounting and unregistration
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/9p/vfs_inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index c95295c65045..e83aa5ebe861 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -626,8 +626,7 @@ static struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, return NULL; error: - if (fid) - p9_client_clunk(fid); + p9_client_clunk(fid); return ERR_PTR(result); } |