Merge tag 'iio-fixes-4.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux.git] / kernel / user.c

diff --git a/kernel/user.c b/kernel/user.c
index 5f65ef195259998ff2545dde4ebbeef56afe6609..0df9b1640b2af5d4ade21a376172fdfd6d097694 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -169,11 +169,8 @@ void free_uid(struct user_struct *up)
        if (!up)
                return;
 
-       local_irq_save(flags);
-       if (refcount_dec_and_lock(&up->__count, &uidhash_lock))
+       if (refcount_dec_and_lock_irqsave(&up->__count, &uidhash_lock, &flags))
                free_user(up, flags);
-       else
-               local_irq_restore(flags);
 }
 
 struct user_struct *alloc_uid(kuid_t uid)