aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-04-22 11:42:10 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-04-22 11:42:10 -0400
commitc3e5084b9f0a2df175d69aff0e290341e267cae7 (patch)
tree4a00a591feb744d0fc72ee59cadfe0bfa5e39d5e /ipc
parent54cf98b026bf3bdcb5a3584061cdf2000ab423f3 (diff)
parent8c52885dad553e1b799fb375c061dc4bb56f93ef (diff)
Merge tag 'v3.6.11.2' into v3.6-rt
Linux 3.6.11.2
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 296aa15a6469..ce364ac8de63 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -841,7 +841,8 @@ out_putfd:
fd = error;
}
mutex_unlock(&root->d_inode->i_mutex);
- mnt_drop_write(mnt);
+ if (!ro)
+ mnt_drop_write(mnt);
out_putname:
putname(name);
return fd;