file_inode(f)->i_mapping is f->f_mapping

[cascardo/linux.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 9dc4999..1f157ad 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -503,7 +503,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
        if (!new_len)
                return ret;
 
-       down_write(&current->mm->mmap_sem);
+       if (down_write_killable(&current->mm->mmap_sem))
+               return -EINTR;
 
        if (flags & MREMAP_FIXED) {
                ret = mremap_to(addr, old_len, new_addr, new_len,