Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / ipc / util.h

diff --git a/ipc/util.h b/ipc/util.h
index da65e8afb8f49a9db110ad21b057a63679dd8113..b6a6a88f30024f17dff00e7257c622dca2af1912 100644 (file)
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -177,12 +177,12 @@ static inline void ipc_assert_locked_object(struct kern_ipc_perm *perm)
 static inline void ipc_lock_by_ptr(struct kern_ipc_perm *perm)
 {
        rcu_read_lock();
-       spin_lock(&perm->lock);
+       ipc_lock_object(perm);
 }
 
 static inline void ipc_unlock(struct kern_ipc_perm *perm)
 {
-       spin_unlock(&perm->lock);
+       ipc_unlock_object(perm);
        rcu_read_unlock();
 }