diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /ipc | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
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, | |||
| 176 | } | 176 | } |
| 177 | return inode; | 177 | return inode; |
| 178 | out_inode: | 178 | out_inode: |
| 179 | make_bad_inode(inode); | ||
| 180 | iput(inode); | 179 | iput(inode); |
| 181 | return NULL; | 180 | return NULL; |
| 182 | } | 181 | } |