diff for duplicates of <20150907124148.GB32668@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 4284f1b..b9cda5d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,31 +18,31 @@ I leave this to you and maintainers. > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> > --- -> mm/mmap.c | 12 ++++++------ -> 1 file changed, 6 insertions(+), 6 deletions(-) +> mm/mmap.c | 12 ++++++------ +> 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/mm/mmap.c b/mm/mmap.c > index 4db7cf0..39fd727 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -2012,10 +2012,8 @@ unsigned long -> get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, -> unsigned long pgoff, unsigned long flags) -> { +> get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, +> unsigned long pgoff, unsigned long flags) +> { > - unsigned long (*get_area)(struct file *, unsigned long, -> - unsigned long, unsigned long, unsigned long); +> - unsigned long, unsigned long, unsigned long); > - -> unsigned long error = arch_mmap_check(addr, len, flags); +> unsigned long error = arch_mmap_check(addr, len, flags); > + -> if (error) -> return error; -> +> if (error) +> return error; +> > @@ -2023,10 +2021,12 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, -> if (len> TASK_SIZE) -> return -ENOMEM; -> +> if (len> TASK_SIZE) +> return -ENOMEM; +> > - get_area = current->mm->get_unmapped_area; -> if (file && file->f_op->get_unmapped_area) +> if (file && file->f_op->get_unmapped_area) > - get_area = file->f_op->get_unmapped_area; > - addr = get_area(file, addr, len, pgoff, flags); > + addr = file->f_op->get_unmapped_area(file, addr, len, @@ -50,16 +50,10 @@ I leave this to you and maintainers. > + else > + addr = current->mm->get_unmapped_area(file, addr, len, > + pgoff, flags); -> if (IS_ERR_VALUE(addr)) -> return addr; -> -> -- +> if (IS_ERR_VALUE(addr)) +> return addr; +> +> -- > 1.9.3 > -> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> +> diff --git a/a/content_digest b/N1/content_digest index 49a62b5..bbabf79 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -35,31 +35,31 @@ "\n" "> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>\n" "> ---\n" - "> mm/mmap.c | 12 ++++++------\n" - "> 1 file changed, 6 insertions(+), 6 deletions(-)\n" + "> \302\240mm/mmap.c | 12 ++++++------\n" + "> \302\2401 file changed, 6 insertions(+), 6 deletions(-)\n" "> \n" "> diff --git a/mm/mmap.c b/mm/mmap.c\n" "> index 4db7cf0..39fd727 100644\n" "> --- a/mm/mmap.c\n" "> +++ b/mm/mmap.c\n" "> @@ -2012,10 +2012,8 @@ unsigned long\n" - "> get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,\n" - "> \t\tunsigned long pgoff, unsigned long flags)\n" - "> {\n" + "> \302\240get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,\n" + "> \302\240\t\tunsigned long pgoff, unsigned long flags)\n" + "> \302\240{\n" "> -\tunsigned long (*get_area)(struct file *, unsigned long,\n" - "> -\t\t\t\t unsigned long, unsigned long, unsigned long);\n" + "> -\t\t\t\t \302\240unsigned long, unsigned long, unsigned long);\n" "> -\n" - "> \tunsigned long error = arch_mmap_check(addr, len, flags);\n" + "> \302\240\tunsigned long error = arch_mmap_check(addr, len, flags);\n" "> +\n" - "> \tif (error)\n" - "> \t\treturn error;\n" - "> \n" + "> \302\240\tif (error)\n" + "> \302\240\t\treturn error;\n" + "> \302\240\n" "> @@ -2023,10 +2021,12 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,\n" - "> \tif (len> TASK_SIZE)\n" - "> \t\treturn -ENOMEM;\n" - "> \n" + "> \302\240\tif (len> TASK_SIZE)\n" + "> \302\240\t\treturn -ENOMEM;\n" + "> \302\240\n" "> -\tget_area = current->mm->get_unmapped_area;\n" - "> \tif (file && file->f_op->get_unmapped_area)\n" + "> \302\240\tif (file && file->f_op->get_unmapped_area)\n" "> -\t\tget_area = file->f_op->get_unmapped_area;\n" "> -\taddr = get_area(file, addr, len, pgoff, flags);\n" "> +\t\taddr = file->f_op->get_unmapped_area(file, addr, len,\n" @@ -67,18 +67,12 @@ "> +\telse\n" "> +\t\taddr = current->mm->get_unmapped_area(file, addr, len,\n" "> +\t\t\t\t\t\t\tpgoff, flags);\n" - "> \tif (IS_ERR_VALUE(addr))\n" - "> \t\treturn addr;\n" - "> \n" - "> -- \n" + "> \302\240\tif (IS_ERR_VALUE(addr))\n" + "> \302\240\t\treturn addr;\n" + "> \302\240\n" + "> --\302\240\n" "> 1.9.3\n" "> \n" - "> \t\t \t \t\t \n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + > -a7bb1585814fa5ef4acc83c5c699dc6befb4a8a11c8f4dacb6e82d4b23fc1911 +2c5815fb43e4302aca96004683252c1000e016b54b1d42100d3af46e177d5266
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.