diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:47:21 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:47:21 -0500 |
| commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
| tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /net/sunrpc/rpc_pipe.c | |
| parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
| parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'net/sunrpc/rpc_pipe.c')
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 09f01f41e55a..72bc53683965 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -474,7 +474,7 @@ static int __rpc_create_common(struct inode *dir, struct dentry *dentry, | |||
| 474 | { | 474 | { |
| 475 | struct inode *inode; | 475 | struct inode *inode; |
| 476 | 476 | ||
| 477 | BUG_ON(!d_unhashed(dentry)); | 477 | d_drop(dentry); |
| 478 | inode = rpc_get_inode(dir->i_sb, mode); | 478 | inode = rpc_get_inode(dir->i_sb, mode); |
| 479 | if (!inode) | 479 | if (!inode) |
| 480 | goto out_err; | 480 | goto out_err; |