1 files changed, 0 insertions, 9 deletions

diff --git a/ipc/util.c b/ipc/util.c
index 3339177b336c..0f468c34e83c 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -688,10 +688,6 @@ void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out)
  * Look for an id in the ipc ids idr and lock the associated ipc object.
  *
  * The ipc object is locked on exit.
- *
- * This is the routine that should be called when the rw_mutex is not already
- * held, i.e. idr tree not protected: it protects the idr tree in read mode
- * during the idr_find().
  */
 
 struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
@@ -699,18 +695,13 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
         struct kern_ipc_perm *out;
         int lid = ipcid_to_idx(id);
 
-        down_read(&ids->rw_mutex);
-
         rcu_read_lock();
         out = idr_find(&ids->ipcs_idr, lid);
         if (out == NULL) {
                 rcu_read_unlock();
-                up_read(&ids->rw_mutex);
                 return ERR_PTR(-EINVAL);
         }
 
-        up_read(&ids->rw_mutex);
-
         spin_lock(&out->lock);
         
         /* ipc_rmid() may have already freed the ID while ipc_lock