diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 00:12:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 00:12:39 -0400 |
| commit | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (patch) | |
| tree | bf68721fb65b64392177f498a9ba61ef027b2b3d /ipc/mqueue.c | |
| parent | 90ec7819737d42a0ad1c2df1ff56016facae3c6e (diff) | |
| parent | 01afaf61983d08ed1c9e5e8f2fcf4f40e9008033 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Minix: Clean up left over label
fix truncate inode time modification breakage
fix setattr error handling in sysfs, configfs
fcntl: return -EFAULT if copy_to_user fails
wrong type for 'magic' argument in simple_fill_super()
fix the deadlock in qib_fs
mqueue doesn't need make_bad_inode()
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 | } |