[patchlet] Minor cleanup in mm/filemap.c (2.4.0-t9p2)

From: Rasmus Andersen (rasmus@jaquet.dk)
Date: Mon Sep 18 2000 - 14:05:23 EST


Hi.

The following patch cleans up some minor stuff in mm/filemap.c:

o transmorphs tsk->state=XX -> __set_task_state
o removes the wait argument to filemap_write_page (it is not used)
  and cleans up the two places filemap_write_page is called.
o cleans up some comments.

--- linux-240test9-pre2-clean/mm/filemap.c Sun Sep 17 19:38:03 2000
+++ linux/mm/filemap.c Mon Sep 18 21:03:24 2000
@@ -491,7 +491,7 @@
                 run_task_queue(&tq_disk);
                 schedule();
         } while (PageLocked(page));
- tsk->state = TASK_RUNNING;
+ __set_task_state(tsk, TASK_RUNNING);
         remove_wait_queue(&page->wait, &wait);
 }
 
@@ -1450,8 +1450,7 @@
 }
 
 static int filemap_write_page(struct file *file,
- struct page * page,
- int wait)
+ struct page * page)
 {
         /*
          * If a task terminates while we're swapping the page, the vma and
@@ -1471,7 +1470,7 @@
 extern void wakeup_bdflush(int);
 int filemap_swapout(struct page * page, struct file * file)
 {
- int retval = filemap_write_page(file, page, 0);
+ int retval = filemap_write_page(file, page);
         wakeup_bdflush(0);
         return retval;
 }
@@ -1518,7 +1517,7 @@
                         pgoff, page->index, address, vma->vm_start, vma->vm_pgoff);
         }
         lock_page(page);
- error = filemap_write_page(vma->vm_file, page, 1);
+ error = filemap_write_page(vma->vm_file, page);
         UnlockPage(page);
         page_cache_free(page);
         return error;
@@ -2118,7 +2117,7 @@
         if (!tmp)
                 return error;
 
- /* (end - start) is # of pages, and also # of bytes in "vec */
+ /* (end - start) is # of pages, and also # of bytes in vec */
         remaining = (end - start),
 
         error = 0;
@@ -2157,9 +2156,9 @@
  * return values:
  * zero - success
  * -EFAULT - vec points to an illegal address
- * -EINVAL - addr is not a multiple of PAGE_CACHE_SIZE,
+ * -EINVAL - start is not a multiple of PAGE_CACHE_SIZE,
  * or len has a nonpositive value
- * -ENOMEM - Addresses in the range [addr, addr + len] are
+ * -ENOMEM - Addresses in the range [start, start + len] are
  * invalid for the address space of this process, or
  * specify one or more pages which are not currently
  * mapped

-- 
Regards,
        Rasmus(rasmus@jaquet.dk)

What a terrible thing to have lost one's mind. Or not to have a mind at all. How true that is. -- Vice President Dan Quayle winning friends while speaking to the United Negro College Fund - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 21:00:18 EST