diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:53:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:53:19 +0200 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /ipc | |
| parent | perf session: fix error message on failure to open perf.data (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-646b1db4956ba8bf748b835b5eba211133d91c2e.tar.xz linux-646b1db4956ba8bf748b835b5eba211133d91c2e.zip | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 5108232f93d4..c93fd3faac2d 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -176,7 +176,6 @@ static struct inode *mqueue_get_inode(struct super_block *sb, } return inode; out_inode: - make_bad_inode(inode); iput(inode); return NULL; } |