projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 (err)
goto out_fput;
- if (
down_write_killable(¤t->mm->mmap_se
m)) {
+ if (
mmap_write_lock_killable(current->m
m)) {
err = -EINTR;
goto out_fput;
}
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:
if (IS_ERR_VALUE(addr))
err = (long)addr;
invalid:
-
up_write(¤t->mm->mmap_se
m);
+
mmap_write_unlock(current->m
m);
if (populate)
mm_populate(addr, populate);
if (populate)
mm_populate(addr, populate);
@@
-1638,7
+1638,7
@@
long ksys_shmdt(char __user *shmaddr)
if (addr & ~PAGE_MASK)
return retval;
if (addr & ~PAGE_MASK)
return retval;
- if (
down_write_killable(&mm->mmap_se
m))
+ if (
mmap_write_lock_killable(m
m))
return -EINTR;
/*
return -EINTR;
/*
@@
-1726,7
+1726,7
@@
long ksys_shmdt(char __user *shmaddr)
#endif
#endif
-
up_write(&mm->mmap_se
m);
+
mmap_write_unlock(m
m);
return retval;
}
return retval;
}