diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /ipc/mqueue.c | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'ipc/mqueue.c')
| -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 | } |