Merge tag 'iomap-5.8-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-block.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 0ba6add05b35afdb0ee7947c6ece7fb9ecc64c65..0a6dd94afa2176ab68da0614e5d2b1ab3f078877 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1544,7 +1544,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
        if (err)
                goto out_fput;
 
-       if (down_write_killable(&current->mm->mmap_sem)) {
+       if (mmap_write_lock_killable(current->mm)) {
                err = -EINTR;
                goto out_fput;
        }
@@ -1564,7 +1564,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
        if (IS_ERR_VALUE(addr))
                err = (long)addr;
 invalid:
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        if (populate)
                mm_populate(addr, populate);
 
@@ -1638,7 +1638,7 @@ long ksys_shmdt(char __user *shmaddr)
        if (addr & ~PAGE_MASK)
                return retval;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        /*
@@ -1726,7 +1726,7 @@ long ksys_shmdt(char __user *shmaddr)
 
 #endif
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return retval;
 }