This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index 6b523da..9baeee0 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -14,7 +14,6 @@
 #include <linux/time.h>
 #include <linux/aio_abi.h>
 #include <linux/module.h>
-#include <linux/syscalls.h>
 
 #define DEBUG 0
 
@@ -118,6 +117,8 @@ static int aio_setup_ring(struct kioctx *ctx)
        if (nr_pages < 0)
                return -EINVAL;
 
+       info->nr_pages = nr_pages;
+
        nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
 
        info->nr = 0;
@@ -570,7 +571,6 @@ void use_mm(struct mm_struct *mm)
        struct task_struct *tsk = current;
 
        task_lock(tsk);
-       tsk->flags |= PF_BORROWED_MM;
        active_mm = tsk->active_mm;
        atomic_inc(&mm->mm_count);
        tsk->mm = mm;
@@ -597,7 +597,6 @@ void unuse_mm(struct mm_struct *mm)
        struct task_struct *tsk = current;
 
        task_lock(tsk);
-       tsk->flags &= ~PF_BORROWED_MM;
        tsk->mm = NULL;
        /* active_mm is still 'mm' */
        enter_lazy_tlb(mm, tsk);