diff for duplicates of <406E3613.6080609@sgi.com> diff --git a/a/1.txt b/N1/1.txt index f94a525..6b0f474 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,7 +63,7 @@ that problem.) Suggestions, flames, criticisms or (gasp) even praise gladly accepted by the undersigned. :-) -====================================== +============================================================================ # This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. @@ -276,7 +276,7 @@ diff -Nru a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c + if (htlbzone_pages <= htlbzone_reserved) + break; page = alloc_hugetlb_page(); - if (page = NULL) + if (page == NULL) break; @@ -541,6 +599,7 @@ printk(KERN_WARNING "Invalid huge page size specified\n"); @@ -424,7 +424,7 @@ diff -Nru a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c vma->vm_ops = &hugetlb_vm_ops; - ret = hugetlb_prefault(mapping, vma); - len = vma_len + ((loff_t)vma->vm_pgoff << PAGE_SHIFT); -- if (ret = 0 && inode->i_size < len) +- if (ret == 0 && inode->i_size < len) - inode->i_size = len; - up(&inode->i_sem); @@ -461,7 +461,7 @@ diff -Nru a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c - if (inode->i_data.nrpages) - truncate_hugepages(&inode->i_data, 0); + /* -+ * we need to call this even if inode->i_data.nrpages = 0 to ++ * we need to call this even if inode->i_data.nrpages == 0 to + * update the file system quota and hugetlb page reservation + */ + truncate_hugepages(&inode->i_data, 0); @@ -475,7 +475,7 @@ diff -Nru a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c - if (inode->i_data.nrpages) - truncate_hugepages(&inode->i_data, 0); + /* -+ * we need to call this even if inode->i_data.nrpages = 0 to ++ * we need to call this even if inode->i_data.nrpages == 0 to + * update the file system quota and hugetlb page reservation + */ + truncate_hugepages(&inode->i_data, 0); @@ -591,7 +591,7 @@ diff -Nru a/mm/memory.c b/mm/memory.c /* * We need the page table lock to synchronize with kswapd -====================================== +============================================================================ -- diff --git a/a/content_digest b/N1/content_digest index 7cbc310..331bb60 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200404012309.i31N9MF14696@unix-os.sc.intel.com\0" "From\0Ray Bryant <raybry@sgi.com>\0" "Subject\0Re: [PATCH] HUGETLB memory commitment\0" - "Date\0Sat, 03 Apr 2004 03:57:07 +0000\0" + "Date\0Fri, 02 Apr 2004 21:57:07 -0600\0" "To\0Chen" " Kenneth W <kenneth.w.chen@intel.com>\0" "Cc\0'Andy Whitcroft' <apw@shadowen.org>" @@ -80,7 +80,7 @@ "Suggestions, flames, criticisms or (gasp) even praise gladly accepted by the\n" "undersigned. :-)\n" "\n" - "======================================\n" + "============================================================================\n" "# This is a BitKeeper generated patch for the following project:\n" "# Project Name: Linux kernel tree\n" "# This patch format is intended for GNU patch command version 2.5 or higher.\n" @@ -293,7 +293,7 @@ "+\t\tif (htlbzone_pages <= htlbzone_reserved)\n" "+\t\t\tbreak;\n" " \t\tpage = alloc_hugetlb_page();\n" - " \t\tif (page = NULL)\n" + " \t\tif (page == NULL)\n" " \t\t\tbreak;\n" "@@ -541,6 +599,7 @@\n" " \t\tprintk(KERN_WARNING \"Invalid huge page size specified\\n\");\n" @@ -441,7 +441,7 @@ " \tvma->vm_ops = &hugetlb_vm_ops;\n" "-\tret = hugetlb_prefault(mapping, vma);\n" "-\tlen = vma_len +\t((loff_t)vma->vm_pgoff << PAGE_SHIFT);\n" - "-\tif (ret = 0 && inode->i_size < len)\n" + "-\tif (ret == 0 && inode->i_size < len)\n" "-\t\tinode->i_size = len;\n" "-\tup(&inode->i_sem);\n" "\n" @@ -478,7 +478,7 @@ "-\tif (inode->i_data.nrpages)\n" "-\t\ttruncate_hugepages(&inode->i_data, 0);\n" "+\t/*\n" - "+\t * we need to call this even if inode->i_data.nrpages = 0 to\n" + "+\t * we need to call this even if inode->i_data.nrpages == 0 to\n" "+\t * update the file system quota and hugetlb page reservation\n" "+\t */\n" "+\ttruncate_hugepages(&inode->i_data, 0);\n" @@ -492,7 +492,7 @@ "-\tif (inode->i_data.nrpages)\n" "-\t\ttruncate_hugepages(&inode->i_data, 0);\n" "+\t/*\n" - "+\t * we need to call this even if inode->i_data.nrpages = 0 to\n" + "+\t * we need to call this even if inode->i_data.nrpages == 0 to\n" "+\t * update the file system quota and hugetlb page reservation\n" "+\t */\n" "+\ttruncate_hugepages(&inode->i_data, 0);\n" @@ -608,7 +608,7 @@ " \t/*\n" " \t * We need the page table lock to synchronize with kswapd\n" "\n" - "======================================\n" + "============================================================================\n" "\n" "\n" "-- \n" @@ -622,4 +622,4 @@ " so I installed Linux.\n" ----------------------------------------------- -501c99af74149cda6a8b42216aa9e7a468892c92e53767bce5ba37ca8a1e0a65 +0d8d85c4140b834a9af67f6001d8d7c1ace75562880e1320142e36850da69281
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.