aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/mqueue.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 13:05:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 13:05:37 -0400
commit2849a3a945d0e440fa245c47c49c80ef1cc103c3 (patch)
tree616868130f4b8a063cfa1c138135c10247a4da0e /ipc/mqueue.c
parent417c765af914106f5e76c4e0181dd555fe6a89a0 (diff)
parent8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff)
Merge 3.9-rc4 into usb-next
This picks up the fixes we had for USB in 3.9-rc4 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r--ipc/mqueue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index e5c4f609f22c..3953fda2e8bd 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -840,7 +840,8 @@ out_putfd:
840 fd = error; 840 fd = error;
841 } 841 }
842 mutex_unlock(&root->d_inode->i_mutex); 842 mutex_unlock(&root->d_inode->i_mutex);
843 mnt_drop_write(mnt); 843 if (!ro)
844 mnt_drop_write(mnt);
844out_putname: 845out_putname:
845 putname(name); 846 putname(name);
846 return fd; 847 return fd;