diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /fs/9p/vfs_inode.c | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -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, | |||
| 626 | return NULL; | 626 | return NULL; |
| 627 | 627 | ||
| 628 | error: | 628 | error: |
| 629 | if (fid) | 629 | p9_client_clunk(fid); |
| 630 | p9_client_clunk(fid); | ||
| 631 | 630 | ||
| 632 | return ERR_PTR(result); | 631 | return ERR_PTR(result); |
| 633 | } | 632 | } |