)]}' { "log": [ { "commit": "11bcb32848ddb5ab28f09f142b625e2ba4d55c4c", "tree": "9a2c085e1fce41012bb0f2a340f6ceaaf616b7a0", "parents": [ "ed2d265d1266736bd294332d7f649003943ae36e", "8bc3bcc93a2b4e47d5d410146f6546bca6171663" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:24:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:24:31 2012 -0700" }, "message": "Merge tag \u0027module-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:\n \"Fix up files in fs/ and lib/ dirs to only use module.h if they really\n need it.\n\n These are trivial in scope vs the work done previously. We now have\n things where any few remaining cleanups can be farmed out to arch or\n subsystem maintainers, and I have done so when possible. What is\n remaining here represents the bits that don\u0027t clearly lie within a\n single arch/subsystem boundary, like the fs dir and the lib dir.\n\n Some duplicate includes arising from overlapping fixes from\n independent subsystem maintainer submissions are also quashed.\"\n\nFix up trivial conflicts due to clashes with other include file cleanups\n(including some due to the previous bug.h cleanup pull).\n\n* tag \u0027module-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n lib: reduce the use of module.h wherever possible\n fs: reduce the use of module.h wherever possible\n includecheck: delete any duplicate instances of module.h\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "tree": "1cbfd86070f724d5ffe53146d4c67edf14cccf98", "parents": [ "dae430c6f6e5d0b98c238c340a41a39e221e8940", "4e474a00d7ff746ed177ddae14fa8b2d4bad7a00" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 18:08:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 18:08:58 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl\n\nPull sysctl updates from Eric Biederman:\n\n - Rewrite of sysctl for speed and clarity.\n\n Insert/remove/Lookup in sysctl are all now O(NlogN) operations, and\n are no longer bottlenecks in the process of adding and removing\n network devices.\n\n sysctl is now focused on being a filesystem instead of system call\n and the code can all be found in fs/proc/proc_sysctl.c. Hopefully\n this means the code is now approachable.\n\n Much thanks is owed to Lucian Grinjincu for keeping at this until\n something was found that was usable.\n\n - The recent proc_sys_poll oops found by the fuzzer during hibernation\n is fixed.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl: (36 commits)\n sysctl: protect poll() in entries that may go away\n sysctl: Don\u0027t call sysctl_follow_link unless we are a link.\n sysctl: Comments to make the code clearer.\n sysctl: Correct error return from get_subdir\n sysctl: An easier to read version of find_subdir\n sysctl: fix memset parameters in setup_sysctl_set()\n sysctl: remove an unused variable\n sysctl: Add register_sysctl for normal sysctl users\n sysctl: Index sysctl directories with rbtrees.\n sysctl: Make the header lists per directory.\n sysctl: Move sysctl_check_dups into insert_header\n sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy\n sysctl: Replace root_list with links between sysctl_table_sets.\n sysctl: Add sysctl_print_dir and use it in get_subdir\n sysctl: Stop requiring explicit management of sysctl directories\n sysctl: Add a root pointer to ctl_table_set\n sysctl: Rewrite proc_sys_readdir in terms of first_entry and next_entry\n sysctl: Rewrite proc_sys_lookup introducing find_entry and lookup_entry.\n sysctl: Normalize the root_table data structure.\n sysctl: Factor out insert_header and erase_header\n ...\n" }, { "commit": "e075f59152890ffd7e3d704afc997dd686c8a781", "tree": "94dbf5eda32d7dea9821ca308c4317e75756f7bd", "parents": [ "1b26c9b334044cff6d1d2698f2be41bc7d9a0864" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Fri Mar 23 15:02:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "seq_file: add seq_set_overflow(), seq_overflow()\n\nIt is undocumented but a seq_file\u0027s overflow state is indicated by\nm-\u003ecount \u003d\u003d m-\u003esize. Add seq_set_overflow() and seq_overflow() to\nset/check overflow status explicitly.\n\nBased on an idea from Eric Dumazet.\n\n[akpm@linux-foundation.org: tweak code comment]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1b26c9b334044cff6d1d2698f2be41bc7d9a0864", "tree": "533eb56100209cd0d8ec2c1f3d354af1695226f9", "parents": [ "bda7bad62bc4c4e0783348e8db51abe094153c56" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Fri Mar 23 15:02:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "proc-ns: use d_set_d_op() API to set dentry ops in proc_ns_instantiate().\n\nThe namespace cleanup path leaks a dentry which holds a reference count\non a network namespace. Keeping that network namespace from being freed\nwhen the last user goes away. Leaving things like vlan devices in the\nleaked network namespace.\n\nIf you use ip netns add for much real work this problem becomes apparent\npretty quickly. It light testing the problem hides because frequently\nyou simply don\u0027t notice the leak.\n\nUse d_set_d_op() so that DCACHE_OP_* flags are set correctly.\n\nThis issue exists back to 3.0.\n\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nReported-by: Justin Pettit \u003cjpettit@nicira.com\u003e\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bda7bad62bc4c4e0783348e8db51abe094153c56", "tree": "c62650a3da656ba18aebe170df7d554158ae5fc5", "parents": [ "1ac101a5d675aca2426c5cd460c73fb95acb8391" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Fri Mar 23 15:02:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "procfs: speed up /proc/pid/stat, statm\n\nProcess accounting applications as top, ps visit some files under\n/proc/\u003cpid\u003e. With seq_put_decimal_ull(), we can optimize /proc/\u003cpid\u003e/stat\nand /proc/\u003cpid\u003e/statm files.\n\nThis patch adds\n - seq_put_decimal_ll() for signed values.\n - allow delimiter \u003d\u003d 0.\n - convert seq_printf() to seq_put_decimal_ull/ll in /proc/stat, statm.\n\nTest result on a system with 2000+ procs.\n\nBefore patch:\n [kamezawa@bluextal test]$ top -b -n 1 | wc -l\n 2223\n [kamezawa@bluextal test]$ time top -b -n 1 \u003e /dev/null\n\n real 0m0.675s\n user 0m0.044s\n sys 0m0.121s\n\n [kamezawa@bluextal test]$ time ps -elf \u003e /dev/null\n\n real 0m0.236s\n user 0m0.056s\n sys 0m0.176s\n\nAfter patch:\n kamezawa@bluextal ~]$ time top -b -n 1 \u003e /dev/null\n\n real 0m0.657s\n user 0m0.052s\n sys 0m0.100s\n\n [kamezawa@bluextal ~]$ time ps -elf \u003e /dev/null\n\n real 0m0.198s\n user 0m0.050s\n sys 0m0.145s\n\nConsidering top, ps tend to scan /proc periodically, this will reduce cpu\nconsumption by top/ps to some extent.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ac101a5d675aca2426c5cd460c73fb95acb8391", "tree": "5d993fde0c5e67de97c0d9ffac54163f06fc90c9", "parents": [ "59a32e2ce5eb809967cac4e718bc527beca83c59" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Fri Mar 23 15:02:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "procfs: add num_to_str() to speed up /proc/stat\n\n\u003d\u003d stat_check.py\nnum \u003d 0\nwith open(\"/proc/stat\") as f:\n while num \u003c 1000 :\n data \u003d f.read()\n f.seek(0, 0)\n num \u003d num + 1\n\u003d\u003d\n\nperf shows\n\n 20.39% stat_check.py [kernel.kallsyms] [k] format_decode\n 13.41% stat_check.py [kernel.kallsyms] [k] number\n 12.61% stat_check.py [kernel.kallsyms] [k] vsnprintf\n 10.85% stat_check.py [kernel.kallsyms] [k] memcpy\n 4.85% stat_check.py [kernel.kallsyms] [k] radix_tree_lookup\n 4.43% stat_check.py [kernel.kallsyms] [k] seq_printf\n\nThis patch removes most of calls to vsnprintf() by adding num_to_str()\nand seq_print_decimal_ull(), which prints decimal numbers without rich\nfunctions provided by printf().\n\nOn my 8cpu box.\n\u003d\u003d Before patch \u003d\u003d\n[root@bluextal test]# time ./stat_check.py\n\nreal 0m0.150s\nuser 0m0.026s\nsys 0m0.121s\n\n\u003d\u003d After patch \u003d\u003d\n[root@bluextal test]# time ./stat_check.py\n\nreal 0m0.055s\nuser 0m0.022s\nsys 0m0.030s\n\n[akpm@linux-foundation.org: remove incorrect comment, use less statck in num_to_str(), move comment from .h to .c, simplify seq_put_decimal_ull()]\n[andrea@betterlinux.com: avoid breaking the ABI in /proc/stat]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrea Righi \u003candrea@betterlinux.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Paul Turner \u003cpjt@google.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "59a32e2ce5eb809967cac4e718bc527beca83c59", "tree": "3024b71063f497c138680c36c5f7ce2dee563680", "parents": [ "b908243c549448fc0662f9cdd8d5cfe620fcdc31" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Mar 23 15:02:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "proc: speed up /proc/stat handling\n\nOn a typical 16 cpus machine, \"cat /proc/stat\" gives more than 4096 bytes,\nand is slow :\n\n # strace -T -o /tmp/STRACE cat /proc/stat | wc -c\n 5826\n # grep \"cpu \" /tmp/STRACE\n read(0, \"cpu 1949310 19 2144714 12117253\"..., 32768) \u003d 5826 \u003c0.001504\u003e\n\nThats partly because show_stat() must be called twice since initial\nbuffer size is too small (4096 bytes for less than 32 possible cpus)\n\nFix this by :\n\n 1) Taking into account nr_irqs in the initial buffer sizing.\n\n 2) Using ksize() to allow better filling of initial buffer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Paul Turner \u003cpjt@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b908243c549448fc0662f9cdd8d5cfe620fcdc31", "tree": "fe3ba53fb4b1f37048ba986080623af0365eb6e5", "parents": [ "accb61fe7bb0f5c2a4102239e4981650f9048519" ], "author": { "name": "Djalal Harouni", "email": "tixxdz@opendz.org", "time": "Fri Mar 23 15:02:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static\n\nget_sparsemem_vmemmap_info() is only used inside fs/proc/kcore.c\n\nSigned-off-by: Djalal Harouni \u003ctixxdz@opendz.org\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "accb61fe7bb0f5c2a4102239e4981650f9048519", "tree": "5e7120b80944d9719684b94e0c419761ba2d59e1", "parents": [ "909af768e88867016f427264ae39d27a57b6a8ed" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Fri Mar 23 15:02:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP\n\nSince we no longer need the VM_ALWAYSDUMP flag, let\u0027s use the freed bit\nfor \u0027VM_NODUMP\u0027 flag. The idea is is to add a new madvise() flag:\nMADV_DONTDUMP, which can be set by applications to specifically request\nmemory regions which should not dump core.\n\nThe specific application I have in mind is qemu: we can add a flag there\nthat wouldn\u0027t dump all of guest memory when qemu dumps core. This flag\nmight also be useful for security sensitive apps that want to absolutely\nmake sure that parts of memory are not dumped. To clear the flag use:\nMADV_DODUMP.\n\n[akpm@linux-foundation.org: s/MADV_NODUMP/MADV_DONTDUMP/, s/MADV_CLEAR_NODUMP/MADV_DODUMP/, per Roland]\n[akpm@linux-foundation.org: fix up the architectures which broke]\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@hack.frob.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "909af768e88867016f427264ae39d27a57b6a8ed", "tree": "5068b4d98e4bedecde89d9113dc7ef8c69633f45", "parents": [ "1cc684ab75123efe7ff446eb821d44375ba8fa30" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Fri Mar 23 15:02:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:42 2012 -0700" }, "message": "coredump: remove VM_ALWAYSDUMP flag\n\nThe motivation for this patchset was that I was looking at a way for a\nqemu-kvm process, to exclude the guest memory from its core dump, which\ncan be quite large. There are already a number of filter flags in\n/proc/\u003cpid\u003e/coredump_filter, however, these allow one to specify \u0027types\u0027\nof kernel memory, not specific address ranges (which is needed in this\ncase).\n\nSince there are no more vma flags available, the first patch eliminates\nthe need for the \u0027VM_ALWAYSDUMP\u0027 flag. The flag is used internally by\nthe kernel to mark vdso and vsyscall pages. However, it is simple\nenough to check if a vma covers a vdso or vsyscall page without the need\nfor this flag.\n\nThe second patch then replaces the \u0027VM_ALWAYSDUMP\u0027 flag with a new\n\u0027VM_NODUMP\u0027 flag, which can be set by userspace using new madvise flags:\n\u0027MADV_DONTDUMP\u0027, and unset via \u0027MADV_DODUMP\u0027. The core dump filters\ncontinue to work the same as before unless \u0027MADV_DONTDUMP\u0027 is set on the\nregion.\n\nThe qemu code which implements this features is at:\n\n http://people.redhat.com/~jbaron/qemu-dump/qemu-dump.patch\n\nIn my testing the qemu core dump shrunk from 383MB -\u003e 13MB with this\npatch.\n\nI also believe that the \u0027MADV_DONTDUMP\u0027 flag might be useful for\nsecurity sensitive apps, which might want to select which areas are\ndumped.\n\nThis patch:\n\nThe VM_ALWAYSDUMP flag is currently used by the coredump code to\nindicate that a vma is part of a vsyscall or vdso section. However, we\ncan determine if a vma is in one these sections by checking it against\nthe gate_vma and checking for a non-NULL return value from\narch_vma_name(). Thus, freeing a valuable vma bit.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@hack.frob.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d533df07c20c7b59b0559a3ac38fb45c81ffd6bb", "tree": "7b6746dd28654291742a455d46726c0bac461860", "parents": [ "41f0c02eacec9f984adb22e8fecda49e13b7eb13" ], "author": { "name": "Namjae Jeon", "email": "linkinjeon@gmail.com", "time": "Fri Mar 23 15:02:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:40 2012 -0700" }, "message": "fat: fix bug in enforcing Long File Name length\n\nSince \u0027*outlen\u0027 is initialized to zero, it is currently possible to\ncreate a filename of length (FAT_LFN_LEN + 1) when utf8 is not enabled.\nTo enforce the FAT_LFN_LEN limit, we must perform one less iteration.\n\nSigned-off-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Ravishankar N \u003ccyberax82@gmail.com\u003e\nAcked-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "41f0c02eacec9f984adb22e8fecda49e13b7eb13", "tree": "a057fc5dacd08251e826a9588b5e9fc937d3082c", "parents": [ "9eab0a788d2d6e513f43b7c0e5bb9d60446233cb" ], "author": { "name": "Namjae Jeon", "email": "linkinjeon@gmail.com", "time": "Fri Mar 23 15:02:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:40 2012 -0700" }, "message": "fat: clean up xlate_to_uni()\n\nxlate_to_uni() is called by vfat_build_slots() with sbi-\u003enls_io as the\nfinal argument. nls_io can never be null at this point because the\ncheck is already being done in fat_fill_super() wherein the mount fails\nif it is null.\n\nSigned-off-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Ravishankar N \u003ccyberax82@gmail.com\u003e\nAcked-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "da0503aae07f0410b6ff0a9e1d1d011701eb2758", "tree": "2912b9b6342a450b1d4cd9df09b0bc1de02235bb", "parents": [ "02edc6fc4d5feb3357aa44ba521e5504b4ff0b60" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Mar 23 15:02:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "epoll: remove unneeded variable in reverse_path_check()\n\nWe never use the length variable.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02edc6fc4d5feb3357aa44ba521e5504b4ff0b60", "tree": "20c5f006dee327e42335b4f020452d11f26b78b7", "parents": [ "626cf236608505d376e4799adb4f7eb00a8594af" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Mar 23 15:02:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "epoll: comment the funky #ifdef\n\nLooking for a bug in -rt, I stumbled across this code here from: commit\n2dfa4eeab0fc (\"epoll keyed wakeups: teach epoll about hints coming with\nthe wakeup key\"), specifically:\n\n #ifdef CONFIG_DEBUG_LOCK_ALLOC\n static inline void ep_wake_up_nested(wait_queue_head_t *wqueue,\n unsigned long events, int subclass)\n {\n unsigned long flags;\n\n spin_lock_irqsave_nested(\u0026wqueue-\u003elock, flags, subclass);\n wake_up_locked_poll(wqueue, events);\n spin_unlock_irqrestore(\u0026wqueue-\u003elock, flags);\n }\n #else\n static inline void ep_wake_up_nested(wait_queue_head_t *wqueue,\n unsigned long events, int subclass)\n {\n wake_up_poll(wqueue, events);\n }\n #endif\n\nYou change the function of ep_wake_up_nested() depending on whether\nCONFIG_DEBUG_LOCK_ALLOC is set or not. This looks awfully suspicious,\nand there\u0027s no comment to explain why. I initially thought that this\nwas trying to fool lockdep, and hiding a real bug.\n\nInvestigating it, I found the creation of wake_up_nested() (which no\nlonger exists) but was created for the sole purpose of epoll and its\nstrange wake ups, as explained in commit 0ccf831cbee9 (\"lockdep:\nannotate epoll\")\n\nAlthough the commit message says \"annotate epoll\" the change log is much\nbetter at explaining what is happening than what is in the actual code.\nThus a comment is really necessary here. And to save the time of other\ndevelopers from having to go trudging through the git logs trying to\nfigure out why this code exists.\n\nI took parts of the change log and placed it into a comment above the\naffected code. This will make the description of what is happening more\nvisible to new developers that have to look at this code for the first\ntime.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "626cf236608505d376e4799adb4f7eb00a8594af", "tree": "eb0421fec1a7fed05cd9ea785bd18b5f40c80971", "parents": [ "5cde7656d0dd222170eb0250bd1f70c9018fd438" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Mar 23 15:02:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "poll: add poll_requested_events() and poll_does_not_wait() functions\n\nIn some cases the poll() implementation in a driver has to do different\nthings depending on the events the caller wants to poll for. An example\nis when a driver needs to start a DMA engine if the caller polls for\nPOLLIN, but doesn\u0027t want to do that if POLLIN is not requested but instead\nonly POLLOUT or POLLPRI is requested. This is something that can happen\nin the video4linux subsystem among others.\n\nUnfortunately, the current epoll/poll/select implementation doesn\u0027t\nprovide that information reliably. The poll_table_struct does have it: it\nhas a key field with the event mask. But once a poll() call matches one\nor more bits of that mask any following poll() calls are passed a NULL\npoll_table pointer.\n\nAlso, the eventpoll implementation always left the key field at ~0 instead\nof using the requested events mask.\n\nThis was changed in eventpoll.c so the key field now contains the actual\nevents that should be polled for as set by the caller.\n\nThe solution to the NULL poll_table pointer is to set the qproc field to\nNULL in poll_table once poll() matches the events, not the poll_table\npointer itself. That way drivers can obtain the mask through a new\npoll_requested_events inline.\n\nThe poll_table_struct can still be NULL since some kernel code calls it\ninternally (netfs_state_poll() in ./drivers/staging/pohmelfs/netfs.h). In\nthat case poll_requested_events() returns ~0 (i.e. all events).\n\nVery rarely drivers might want to know whether poll_wait will actually\nwait. If another earlier file descriptor in the set already matched the\nevents the caller wanted to wait for, then the kernel will return from the\nselect() call without waiting. This might be useful information in order\nto avoid doing expensive work.\n\nA new helper function poll_does_not_wait() is added that drivers can use\nto detect this situation. This is now used in sock_poll_wait() in\ninclude/net/sock.h. This was the only place in the kernel that needed\nthis information.\n\nDrivers should no longer access any of the poll_table internals, but use\nthe poll_requested_events() and poll_does_not_wait() access functions\ninstead. In order to enforce that the poll_table fields are now prepended\nwith an underscore and a comment was added warning against using them\ndirectly.\n\nThis required a change in unix_dgram_poll() in unix/af_unix.c which used\nthe key field to get the requested events. It\u0027s been replaced by a call\nto poll_requested_events().\n\nFor qproc it was especially important to change its name since the\nbehavior of that field changes with this patch since this function pointer\ncan now be NULL when that wasn\u0027t possible in the past.\n\nAny driver accessing the qproc or key fields directly will now fail to compile.\n\nSome notes regarding the correctness of this patch: the driver\u0027s poll()\nfunction is called with a \u0027struct poll_table_struct *wait\u0027 argument. This\npointer may or may not be NULL, drivers can never rely on it being one or\nthe other as that depends on whether or not an earlier file descriptor in\nthe select()\u0027s fdset matched the requested events.\n\nThere are only three things a driver can do with the wait argument:\n\n1) obtain the key field:\n\n\tevents \u003d wait ? wait-\u003ekey : ~0;\n\n This will still work although it should be replaced with the new\n poll_requested_events() function (which does exactly the same).\n This will now even work better, since wait is no longer set to NULL\n unnecessarily.\n\n2) use the qproc callback. This could be deadly since qproc can now be\n NULL. Renaming qproc should prevent this from happening. There are no\n kernel drivers that actually access this callback directly, BTW.\n\n3) test whether wait \u003d\u003d NULL to determine whether poll would return without\n waiting. This is no longer sufficient as the correct test is now\n wait \u003d\u003d NULL || wait-\u003e_qproc \u003d\u003d NULL.\n\n However, the worst that can happen here is a slight performance hit in\n the case where wait !\u003d NULL and wait-\u003e_qproc \u003d\u003d NULL. In that case the\n driver will assume that poll_wait() will actually add the fd to the set\n of waiting file descriptors. Of course, poll_wait() will not do that\n since it tests for wait-\u003e_qproc. This will not break anything, though.\n\n There is only one place in the whole kernel where this happens\n (sock_poll_wait() in include/net/sock.h) and that code will be replaced\n by a call to poll_does_not_wait() in the next patch.\n\n Note that even if wait-\u003e_qproc !\u003d NULL drivers cannot rely on poll_wait()\n actually waiting. The next file descriptor from the set might match the\n event mask and thus any possible waits will never happen.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nReviewed-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nReviewed-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9710a78e55fe29fa2d2f1a9cbd1d399797585fd9", "tree": "59970afc4345363e690d57cbb9461c16d3c6e8c3", "parents": [ "03ff3efb64c8a64cb8cdf35e36bead5c78eb3024" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Fri Mar 23 15:01:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:31 2012 -0700" }, "message": "fs/notify/notification.c: make subsys_initcall function static\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Arun Sharma \u003casharma@fb.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b502bd1152472dc1b98c60434f23c23b280c7b94", "tree": "4de5d63e00a348108c436ebfd0639b57295e4bfe", "parents": [ "d982d5955e9033015a2cc119aa7c0a878e275964" ], "author": { "name": "Muthu Kumar", "email": "muthu.lkml@gmail.com", "time": "Fri Mar 23 15:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:31 2012 -0700" }, "message": "magic.h: move some FS magic numbers into magic.h\n\n- Move open-coded filesystem magic numbers into magic.h\n\n- Rearrange magic.h so that the filesystem-related constants are grouped\n together.\n\nSigned-off-by: Muthukumar R \u003cmuthur@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e57f146b2837d6a2d04a8ca86cb703f509b00e98", "tree": "0ebde713fc9bae7a0bcf626a5a66219899acd0b3", "parents": [ "7e61b3ff50f59f134054aaf43096c761fafecf0c", "5a1f36c90c9b21a7aa31c29a1926b376dd6a11cf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:27:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:27:40 2012 -0700" }, "message": "Merge tag \u0027upstream-3.4-rc1\u0027 of git://git.infradead.org/linux-ubifs\n\nPull UBIFS changes from Artem Bityutskiy:\n - Improve error messages\n - Clean-up i_nlink management\n - Minor clean-ups\n\n* tag \u0027upstream-3.4-rc1\u0027 of git://git.infradead.org/linux-ubifs:\n UBIFS: improve error messages\n UBIFS: kill CUR_MAX_KEY_LEN macro\n UBIFS: do not use inc_link when i_nlink is zero\n UBIFS: make the dbg_lock spinlock static\n UBIFS: increase dumps loglevel\n UBIFS: amend recovery debugging message\n" }, { "commit": "6e55f8ed814940b0b7420ed633c08e61702bb8d4", "tree": "6e2afd164e3079c2102770053e7cda217778f8ec", "parents": [ "49d99a2f9c4d033cc3965958a1397b1fad573dd3", "381b872cf7942ab8c95de156ce403bd906f3915d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:24:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:24:07 2012 -0700" }, "message": "Merge tag \u0027pstore-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux\n\nPull one pstore patch from Tony Luck\n\n* tag \u0027pstore-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:\n pstore: Introduce get_reason_str() to pstore\n" }, { "commit": "49d99a2f9c4d033cc3965958a1397b1fad573dd3", "tree": "cda1849d49d40d2f25773e86605c55bc6745cf1f", "parents": [ "1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5", "f074211f6041305b645669464343d504f4e6a290" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:19:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:19:22 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\nPull XFS updates from Ben Myers:\n \"Scalability improvements for dquots, log grant code cleanups, plus\n bugfixes and cleanups large and small\"\n\nFix up various trivial conflicts that were due to some of the earlier\npatches already having been integrated into v3.3 as bugfixes, and then\nthere were development patches on top of those. Easily merged by just\ntaking the newer version from the pulled branch.\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs: (45 commits)\n xfs: fallback to vmalloc for large buffers in xfs_getbmap\n xfs: fallback to vmalloc for large buffers in xfs_attrmulti_attr_get\n xfs: remove remaining scraps of struct xfs_iomap\n xfs: fix inode lookup race\n xfs: clean up minor sparse warnings\n xfs: remove the global xfs_Gqm structure\n xfs: remove the per-filesystem list of dquots\n xfs: use per-filesystem radix trees for dquot lookup\n xfs: per-filesystem dquot LRU lists\n xfs: use common code for quota statistics\n xfs: reimplement fdatasync support\n xfs: split in-core and on-disk inode log item fields\n xfs: make xfs_inode_item_size idempotent\n xfs: log timestamp updates\n xfs: log file size updates at I/O completion time\n xfs: log file size updates as part of unwritten extent conversion\n xfs: do not require an ioend for new EOF calculation\n xfs: use per-filesystem I/O completion workqueues\n quota: make Q_XQUOTASYNC a noop\n xfs: include reservations in quota reporting\n ...\n" }, { "commit": "1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5", "tree": "c6684be0e98deb7220153c410be7c1fb7cb0dbbf", "parents": [ "f63d395d47f37a4fe771e6d4b1db9d2cdae5ffc5", "3dd933061d3a4f33fb6ba1616e88fa55a8b8cb9c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:07:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 09:07:15 2012 -0700" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\nPull CIFS fixes from Steve French\n\n* git://git.samba.org/sfrench/cifs-2.6:\n cifs: clean up ordering in exit_cifs\n cifs: clean up call to cifs_dfs_release_automount_timer()\n CIFS: Delete echo_retries module parm\n CIFS: Prepare credits code for a slot reservation\n CIFS: Make wait_for_free_request killable\n CIFS: Introduce credit-based flow control\n CIFS: Simplify inFlight logic\n cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next\n CIFS: Respect negotiated MaxMpxCount\n CIFS: Fix a spurious error in cifs_push_posix_locks\n" }, { "commit": "f63d395d47f37a4fe771e6d4b1db9d2cdae5ffc5", "tree": "3448a14ae965802adb963762cadeb9989ce4caa2", "parents": [ "643ac9fc5429e85b8b7f534544b80bcc4f34c367", "5a7c9eec9fde1da0e3adf0a4ddb64ff2a324a492" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 08:53:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 08:53:47 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client updates for Linux 3.4 from Trond Myklebust:\n \"New features include:\n - Add NFS client support for containers.\n\n This should enable most of the necessary functionality, including\n lockd support, and support for rpc.statd, NFSv4 idmapper and\n RPCSEC_GSS upcalls into the correct network namespace from which\n the mount system call was issued.\n\n - NFSv4 idmapper scalability improvements\n\n Base the idmapper cache on the keyring interface to allow\n concurrent access to idmapper entries. Start the process of\n migrating users from the single-threaded daemon-based approach to\n the multi-threaded request-key based approach.\n\n - NFSv4.1 implementation id.\n\n Allows the NFSv4.1 client and server to mutually identify each\n other for logging and debugging purposes.\n\n - Support the \u0027vers\u003d4.1\u0027 mount option for mounting NFSv4.1 instead of\n having to use the more counterintuitive \u0027vers\u003d4,minorversion\u003d1\u0027.\n\n - SUNRPC tracepoints.\n\n Start the process of adding tracepoints in order to improve\n debugging of the RPC layer.\n\n - pNFS object layout support for autologin.\n\n Important bugfixes include:\n\n - Fix a bug in rpc_wake_up/rpc_wake_up_status that caused them to\n fail to wake up all tasks when applied to priority waitqueues.\n\n - Ensure that we handle read delegations correctly, when we try to\n truncate a file.\n\n - A number of fixes for NFSv4 state manager loops (mostly to do with\n delegation recovery).\"\n\n* tag \u0027nfs-for-3.4-1\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (224 commits)\n NFS: fix sb-\u003es_id in nfs debug prints\n xprtrdma: Remove assumption that each segment is \u003c\u003d PAGE_SIZE\n xprtrdma: The transport should not bug-check when a dup reply is received\n pnfs-obj: autologin: Add support for protocol autologin\n NFS: Remove nfs4_setup_sequence from generic rename code\n NFS: Remove nfs4_setup_sequence from generic unlink code\n NFS: Remove nfs4_setup_sequence from generic read code\n NFS: Remove nfs4_setup_sequence from generic write code\n NFS: Fix more NFS debug related build warnings\n SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined\n nfs: non void functions must return a value\n SUNRPC: Kill compiler warning when RPC_DEBUG is unset\n SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG\n NFS: Use cond_resched_lock() to reduce latencies in the commit scans\n NFSv4: It is not safe to dereference lsp-\u003els_state in release_lockowner\n NFS: ncommit count is being double decremented\n SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()\n Try using machine credentials for RENEW calls\n NFSv4.1: Fix a few issues in filelayout_commit_pagelist\n NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code\n ...\n" }, { "commit": "aab008db8063364dc3c8ccf4981c21124866b395", "tree": "72914203f4decb023efdaabd0301a62d742dfa8c", "parents": [ "4f5b1affdda3e0c48cac674182f52004137b0ffc", "16c0cfa425b8e1488f7a1873bd112a7a099325f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 19:52:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 19:52:47 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm\n\nPull cleancache changes from Konrad Rzeszutek Wilk:\n \"This has some patches for the cleancache API that should have been\n submitted a _long_ time ago. They are basically cleanups:\n\n - rename of flush to invalidate\n\n - moving reporting of statistics into debugfs\n\n - use __read_mostly as necessary.\n\n Oh, and also the MAINTAINERS file change. The files (except the\n MAINTAINERS file) have been in #linux-next for months now. The late\n addition of MAINTAINERS file is a brain-fart on my side - didn\u0027t\n realize I needed that just until I was typing this up - and I based\n that patch on v3.3 - so the tree is on top of v3.3.\"\n\n* tag \u0027stable/for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:\n MAINTAINERS: Adding cleancache API to the list.\n mm: cleancache: Use __read_mostly as appropiate.\n mm: cleancache: report statistics via debugfs instead of sysfs.\n mm: zcache/tmem/cleancache: s/flush/invalidate/\n mm: cleancache: s/flush/invalidate/\n" }, { "commit": "f7493e5d9cc10ac97cf1f1579fdc14117460b40b", "tree": "5c73bd9418b24398b33c5eb2c2fb3ea749d8c631", "parents": [ "989412bbd2835f1475d1528846693eddbac744c8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 16:10:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 16:10:40 2012 -0700" }, "message": "vfs: tidy up sparse warnings in fs/namei.c\n\nWhile doing the fs/namei.c cleanups, I ran sparse on it, and it pointed\nout other large integers and a couple of cases of us using \u00270\u0027 instead\nof the proper \u0027NULL\u0027.\n\nSparse still doesn\u0027t understand some of the conditional locking going\non, but that\u0027s no excuse for not fixing up the trivial stuff.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "989412bbd2835f1475d1528846693eddbac744c8", "tree": "192a4fdeeca43951cc69d30fad6b91c6196f9e8c", "parents": [ "1f1e6e523e43e312c0e0d38c09828d53e9f709fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 15:58:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 15:58:27 2012 -0700" }, "message": "vfs: tidy up fs/namei.c byte-repeat word constants\n\nIn commit commit 1de5b41cd3b2 (\"fs/namei.c: fix warnings on 32-bit\")\nAndrew said that there must be a tidier way of doing this.\n\nThis is that tidier way.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f1e6e523e43e312c0e0d38c09828d53e9f709fc", "tree": "8bf08328cb84dff0bc7a120a1606547e1938cbbd", "parents": [ "f132c5be05e407a99cf582347a2ae0120acd3ad7" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sun Mar 18 21:23:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 15:49:18 2012 -0700" }, "message": "fs: fix kernel-doc warnings in dcache.c\n\nFix kernel-doc warnings in fs/dcache.c:\n\n Warning(fs/dcache.c:1743): No description found for parameter \u0027seqp\u0027\n Warning(fs/dcache.c:1743): Excess function parameter \u0027seq\u0027 description in \u0027__d_lookup_rcu\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f132c5be05e407a99cf582347a2ae0120acd3ad7", "tree": "f089bbd244aad5d5686360080f93ee9e8592a39d", "parents": [ "ba331d5decbfe1cc8b1bf10fb7005f4b972c4f0e" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Thu Mar 22 21:59:52 2012 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 15:10:43 2012 -0700" }, "message": "Fix full_name_hash() behaviour when length is a multiple of 8\n\nWe want it to match what hash_name() is doing, which means extra\nmultiply by 9 in this case...\n\nReported-and-Tested-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4e474a00d7ff746ed177ddae14fa8b2d4bad7a00", "tree": "1255e88406191e4daa29e59ebd37fdc8042184e4", "parents": [ "4e75732035d7e97e001bdf6e3149d3967c0221de" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 22 14:42:22 2012 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Mar 22 14:46:56 2012 -0700" }, "message": "sysctl: protect poll() in entries that may go away\n\nProtect code accessing ctl_table by grabbing the header with grab_header()\nand after releasing with sysctl_head_finish(). This is needed if poll()\nis called in entries created by modules: currently only hostname and\ndomainname support poll(), but this bug may be triggered when/if modules\nuse it and if user called poll() in a file that doesn\u0027t support it.\n\nDave Jones reported the following when using a syscall fuzzer while\nhibernating/resuming:\n\nRIP: 0010:[\u003cffffffff81233e3e\u003e] [\u003cffffffff81233e3e\u003e] proc_sys_poll+0x4e/0x90\nRAX: 0000000000000145 RBX: ffff88020cab6940 RCX: 0000000000000000\nRDX: ffffffff81233df0 RSI: 6b6b6b6b6b6b6b6b RDI: ffff88020cab6940\n[ ... ]\nCode: 00 48 89 fb 48 89 f1 48 8b 40 30 4c 8b 60 e8 b8 45 01 00 00 49 83\n7c 24 28 00 74 2e 49 8b 74 24 30 48 85 f6 74 24 48 85 c9 75 32 \u003c8b\u003e 16\nb8 45 01 00 00 48 63 d2 49 39 d5 74 10 8b 06 48 98 48 89\n\nIf an entry goes away while we are polling() it, ctl_table may not exist\nanymore.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "95211279c5ad00a317c98221d7e4365e02f20836", "tree": "2ddc8625378d2915b8c96392f3cf6663b705ed55", "parents": [ "5375871d432ae9fc581014ac117b96aaee3cd0c7", "12724850e8064f64b6223d26d78c0597c742c65a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge first batch of patches from Andrew Morton:\n \"A few misc things and all the MM queue\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (92 commits)\n memcg: avoid THP split in task migration\n thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE\n memcg: clean up existing move charge code\n mm/memcontrol.c: remove unnecessary \u0027break\u0027 in mem_cgroup_read()\n mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()\n mm/memcontrol.c: s/stealed/stolen/\n memcg: fix performance of mem_cgroup_begin_update_page_stat()\n memcg: remove PCG_FILE_MAPPED\n memcg: use new logic for page stat accounting\n memcg: remove PCG_MOVE_LOCK flag from page_cgroup\n memcg: simplify move_account() check\n memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)\n memcg: kill dead prev_priority stubs\n memcg: remove PCG_CACHE page_cgroup flag\n memcg: let css_get_next() rely upon rcu_read_lock()\n cgroup: revert ss_id_lock to spinlock\n idr: make idr_get_next() good for rcu_read_lock()\n memcg: remove unnecessary thp check in page stat accounting\n memcg: remove redundant returns\n memcg: enum lru_list lru\n ...\n" }, { "commit": "5375871d432ae9fc581014ac117b96aaee3cd0c7", "tree": "be98e8255b0f927fb920fb532a598b93fa140dbe", "parents": [ "b57cb7231b2ce52d3dda14a7b417ae125fb2eb97", "dfbc2d75c1bd47c3186fa91f1655ea2f3825b0ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc merge from Benjamin Herrenschmidt:\n \"Here\u0027s the powerpc batch for this merge window. It is going to be a\n bit more nasty than usual as in touching things outside of\n arch/powerpc mostly due to the big iSeriesectomy :-) We finally got\n rid of the bugger (legacy iSeries support) which was a PITA to\n maintain and that nobody really used anymore.\n\n Here are some of the highlights:\n\n - Legacy iSeries is gone. Thanks Stephen ! There\u0027s still some bits\n and pieces remaining if you do a grep -ir series arch/powerpc but\n they are harmless and will be removed in the next few weeks\n hopefully.\n\n - The \u0027fadump\u0027 functionality (Firmware Assisted Dump) replaces the\n previous (equivalent) \"pHyp assisted dump\"... it\u0027s a rewrite of a\n mechanism to get the hypervisor to do crash dumps on pSeries, the\n new implementation hopefully being much more reliable. Thanks\n Mahesh Salgaonkar.\n\n - The \"EEH\" code (pSeries PCI error handling \u0026 recovery) got a big\n spring cleaning, motivated by the need to be able to implement a\n new backend for it on top of some new different type of firwmare.\n\n The work isn\u0027t complete yet, but a good chunk of the cleanups is\n there. Note that this adds a field to struct device_node which is\n not very nice and which Grant objects to. I will have a patch soon\n that moves that to a powerpc private data structure (hopefully\n before rc1) and we\u0027ll improve things further later on (hopefully\n getting rid of the need for that pointer completely). Thanks Gavin\n Shan.\n\n - I dug into our exception \u0026 interrupt handling code to improve the\n way we do lazy interrupt handling (and make it work properly with\n \"edge\" triggered interrupt sources), and while at it found \u0026 fixed\n a wagon of issues in those areas, including adding support for page\n fault retry \u0026 fatal signals on page faults.\n\n - Your usual random batch of small fixes \u0026 updates, including a bunch\n of new embedded boards, both Freescale and APM based ones, etc...\"\n\nI fixed up some conflicts with the generalized irq-domain changes from\nGrant Likely, hopefully correctly.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (141 commits)\n powerpc/ps3: Do not adjust the wrapper load address\n powerpc: Remove the rest of the legacy iSeries include files\n powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces\n init: Remove CONFIG_PPC_ISERIES\n powerpc: Remove FW_FEATURE ISERIES from arch code\n tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable\n powerpc/spufs: Fix double unlocks\n powerpc/5200: convert mpc5200 to use of_platform_populate()\n powerpc/mpc5200: add options to mpc5200_defconfig\n powerpc/mpc52xx: add a4m072 board support\n powerpc/mpc5200: update mpc5200_defconfig to fit for charon board\n Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup\n powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board\n powerpc/44x: Add support PCI-E for APM821xx SoC and Bluestone board\n MAINTAINERS: Update PowerPC 4xx tree\n powerpc/44x: The bug fixed support for APM821xx SoC and Bluestone board\n powerpc: document the FSL MPIC message register binding\n powerpc: add support for MPIC message register API\n powerpc/fsl: Added aliased MSIIR register address to MSI node in dts\n powerpc/85xx: mpc8548cds - add 36-bit dts\n ...\n" }, { "commit": "ad12ab259d9131a53aa11c7c4561d97f7cc900df", "tree": "457e99e4c4b1facf029a6a094428eaef73f5d261", "parents": [ "30d73f375238441d6dc31de0d90bc39f5bb0bfe5", "220cca2a4f5867db595135e0450381032eb54902" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:00:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:00:03 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw\n\nPull gfs2 changes from Steven Whitehouse.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:\n GFS2: Change truncate page allocation to be GFP_NOFS\n GFS2: call gfs2_write_alloc_required for each chunk\n GFS2: Clean up log flush header writing\n GFS2: Remove a __GFP_NOFAIL allocation\n GFS2: Flush pending glock work when evicting an inode\n GFS2: make sure rgrps are up to date in func gfs2_blk2rgrpd\n GFS2: Eliminate sd_rindex_mutex\n GFS2: Unlock rindex mutex on glock error\n GFS2: Make bd_cmp() static\n GFS2: Sort the ordered write list\n GFS2: FITRIM ioctl support\n GFS2: Move two functions from log.c to lops.c\n GFS2: glock statistics gathering\n" }, { "commit": "d1d5e05ffdc110021ae7937802e88ae0d223dcdc", "tree": "d0960138966aa0436ffad1907f3ad14dcb625ddf", "parents": [ "b69add218d32450d6604bc9080f6e33e19b06f5e" ], "author": { "name": "Hillf Danton", "email": "dhillf@gmail.com", "time": "Wed Mar 21 16:34:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:00 2012 -0700" }, "message": "hugetlbfs: return error code when initializing module\n\nReturn an errno upon failure to create inode kmem cache, and unregister\nthe FS upon failure to mount.\n\n[akpm@linux-foundation.org: remove unneeded test of `error\u0027]\nSigned-off-by: Hillf Danton \u003cdhillf@gmail.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40716e29243de46720e5773797791466c28904ec", "tree": "19616ad05cbead73d0643b002a7ced8baa292ee2", "parents": [ "21a3c273f88c9cbbaf7e14505df0131d95c8f262" ], "author": { "name": "Steven Truelove", "email": "steven.truelove@utoronto.ca", "time": "Wed Mar 21 16:34:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugetlbfs: fix alignment of huge page requests\n\nWhen calling shmget() with SHM_HUGETLB, shmget aligns the request size to\nPAGE_SIZE, but this is not sufficient.\n\nModify hugetlb_file_setup() to align requests to the huge page size, and\nto accept an address argument so that all alignment checks can be\nperformed in hugetlb_file_setup(), rather than in its callers. Change\nnewseg() and mmap_pgoff() to match the new prototype and eliminate a now\nredundant alignment check.\n\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Steven Truelove \u003csteven.truelove@utoronto.ca\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "21a3c273f88c9cbbaf7e14505df0131d95c8f262", "tree": "f3fbc0ebe490b6a339fcea3baa8b39f2260c0b1e", "parents": [ "ea48cf7863c789579b170ef28e7fc62728365d6e" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Mar 21 16:34:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "mm, hugetlb: add thread name and pid to SHM_HUGETLB mlock rlimit warning\n\nAdd the thread name and pid of the application that is allocating shm\nsegments with MAP_HUGETLB without being a part of\n/proc/sys/vm/hugetlb_shm_group or having CAP_IPC_LOCK.\n\nThis identifies the application so it may be fixed by avoiding using the\ndeprecated exception (see Documentation/feature-removal-schedule.txt).\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "05af2e104a0c282dcd9303431e1360750ba76de6", "tree": "cdd5876f2d17b26cc3ded7ef85d04d0e853e9b7e", "parents": [ "90481622d75715bfcb68501280a917dbfe516029" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Mar 21 16:34:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "mm, counters: remove task argument to sync_mm_rss() and __sync_task_rss_stat()\n\nsync_mm_rss() can only be used for current to avoid race conditions in\niterating and clearing its per-task counters. Remove the task argument\nfor it and its helper function, __sync_task_rss_stat(), to avoid thinking\nit can be used safely for anything other than current.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90481622d75715bfcb68501280a917dbfe516029", "tree": "63f7d9e4455366ab326ee74e6b39acf76b618fcf", "parents": [ "a1d776ee3147cec2a54a645e92eb2e3e2f65a137" ], "author": { "name": "David Gibson", "email": "david@gibson.dropbear.id.au", "time": "Wed Mar 21 16:34:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugepages: fix use after free bug in \"quota\" handling\n\nhugetlbfs_{get,put}_quota() are badly named. They don\u0027t interact with the\ngeneral quota handling code, and they don\u0027t much resemble its behaviour.\nRather than being about maintaining limits on on-disk block usage by\nparticular users, they are instead about maintaining limits on in-memory\npage usage (including anonymous MAP_PRIVATE copied-on-write pages)\nassociated with a particular hugetlbfs filesystem instance.\n\nWorse, they work by having callbacks to the hugetlbfs filesystem code from\nthe low-level page handling code, in particular from free_huge_page().\nThis is a layering violation of itself, but more importantly, if the\nkernel does a get_user_pages() on hugepages (which can happen from KVM\namongst others), then the free_huge_page() can be delayed until after the\nassociated inode has already been freed. If an unmount occurs at the\nwrong time, even the hugetlbfs superblock where the \"quota\" limits are\nstored may have been freed.\n\nAndrew Barry proposed a patch to fix this by having hugepages, instead of\nstoring a pointer to their address_space and reaching the superblock from\nthere, had the hugepages store pointers directly to the superblock,\nbumping the reference count as appropriate to avoid it being freed.\nAndrew Morton rejected that version, however, on the grounds that it made\nthe existing layering violation worse.\n\nThis is a reworked version of Andrew\u0027s patch, which removes the extra, and\nsome of the existing, layering violation. It works by introducing the\nconcept of a hugepage \"subpool\" at the lower hugepage mm layer - that is a\nfinite logical pool of hugepages to allocate from. hugetlbfs now creates\na subpool for each filesystem instance with a page limit set, and a\npointer to the subpool gets added to each allocated hugepage, instead of\nthe address_space pointer used now. The subpool has its own lifetime and\nis only freed once all pages in it _and_ all other references to it (i.e.\nsuperblocks) are gone.\n\nsubpools are optional - a NULL subpool pointer is taken by the code to\nmean that no subpool limits are in effect.\n\nPrevious discussion of this bug found in: \"Fix refcounting in hugetlbfs\nquota handling.\". See: https://lkml.org/lkml/2011/8/11/28 or\nhttp://marc.info/?l\u003dlinux-mm\u0026m\u003d126928970510627\u0026w\u003d1\n\nv2: Fixed a bug spotted by Hillf Danton, and removed the extra parameter to\nalloc_huge_page() - since it already takes the vma, it is not necessary.\n\nSigned-off-by: Andrew Barry \u003cabarry@cray.com\u003e\nSigned-off-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1d776ee3147cec2a54a645e92eb2e3e2f65a137", "tree": "244e9a44121be417dc9c999bed2a439b8cb01f8d", "parents": [ "ef6942224a185c9e434f6cfe69fe434e732f5b38" ], "author": { "name": "David Gibson", "email": "david@gibson.dropbear.id.au", "time": "Wed Mar 21 16:34:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugetlb: cleanup hugetlb.h\n\nMake a couple of small cleanups to linux/include/hugetlb.h. The\nset_file_hugepages() function, which was not used anywhere is removed,\nand the hugetlbfs_config and hugetlbfs_inode_info structures with its\nHUGETLBFS_I helper function are moved into inode.c, the only place they\nwere used.\n\nThese structures are really linked to the hugetlbfs filesystem\nspecifically not to hugepage mm handling in general, so they belong in\nthe filesystem code not in a generally available header.\n\nIt would be nice to move the hugetlbfs_sb_info (superblock) structure in\nthere as well, but it\u0027s currently needed in a number of places via the\nhstate_vma() and hstate_inode().\n\nSigned-off-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Andrew Barry \u003cabarry@cray.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a05b0855fd15504972dba2358e5faa172a1e50ba", "tree": "f4cba4ef12d888ec472714f67ef7bcec318a5191", "parents": [ "f5bf18fa22f8c41a13eb8762c7373eb3a93a7333" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Wed Mar 21 16:34:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "hugetlbfs: avoid taking i_mutex from hugetlbfs_read()\n\nTaking i_mutex in hugetlbfs_read() can result in deadlock with mmap as\nexplained below\n\n Thread A:\n read() on hugetlbfs\n hugetlbfs_read() called\n i_mutex grabbed\n hugetlbfs_read_actor() called\n __copy_to_user() called\n page fault is triggered\n Thread B, sharing address space with A:\n mmap() the same file\n -\u003emmap_sem is grabbed on task_B-\u003emm-\u003emmap_sem\n hugetlbfs_file_mmap() is called\n attempt to grab -\u003ei_mutex and block waiting for A to give it up\n Thread A:\n pagefault handled blocked on attempt to grab task_A-\u003emm-\u003emmap_sem,\n which happens to be the same thing as task_B-\u003emm-\u003emmap_sem. Block waiting\n for B to give it up.\n\nAFAIU the i_mutex locking was added to hugetlbfs_read() as per\nhttp://lkml.indiana.edu/hypermail/linux/kernel/0707.2/3066.html to take\ncare of the race between truncate and read. This patch fixes this by\nlooking at page-\u003emapping under lock_page() (find_lock_page()) to ensure\nthat the inode didn\u0027t get truncated in the range during a parallel read.\n\nIdeally we can extend the patch to make sure we don\u0027t increase i_size in\nmmap. But that will break userspace, because applications will now have\nto use truncate(2) to increase i_size in hugetlbfs.\n\nBased on the original patch from Hillf Danton.\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[everything after 2007 :)]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b76437579d1344b612cf1851ae610c636cec7db0", "tree": "37c31c957f1159635258168e27e49b90347e37aa", "parents": [ "9e81130b7ce23050335b1197bb51743517b5b9d0" ], "author": { "name": "Siddhesh Poyarekar", "email": "siddhesh.poyarekar@gmail.com", "time": "Wed Mar 21 16:34:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "procfs: mark thread stack correctly in proc/\u003cpid\u003e/maps\n\nStack for a new thread is mapped by userspace code and passed via\nsys_clone. This memory is currently seen as anonymous in\n/proc/\u003cpid\u003e/maps, which makes it difficult to ascertain which mappings\nare being used for thread stacks. This patch uses the individual task\nstack pointers to determine which vmas are actually thread stacks.\n\nFor a multithreaded program like the following:\n\n\t#include \u003cpthread.h\u003e\n\n\tvoid *thread_main(void *foo)\n\t{\n\t\twhile(1);\n\t}\n\n\tint main()\n\t{\n\t\tpthread_t t;\n\t\tpthread_create(\u0026t, NULL, thread_main, NULL);\n\t\tpthread_join(t, NULL);\n\t}\n\nproc/PID/maps looks like the following:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nHere, one could guess that 7f8a44492000-7f8a44c92000 is a stack since\nthe earlier vma that has no permissions (7f8a44e3d000-7f8a4503d000) but\nthat is not always a reliable way to find out which vma is a thread\nstack. Also, /proc/PID/maps and /proc/PID/task/TID/maps has the same\ncontent.\n\nWith this patch in place, /proc/PID/task/TID/maps are treated as \u0027maps\nas the task would see it\u0027 and hence, only the vma that that task uses as\nstack is marked as [stack]. All other \u0027stack\u0027 vmas are marked as\nanonymous memory. /proc/PID/maps acts as a thread group level view,\nwhere all thread stack vmas are marked as [stack:TID] where TID is the\nprocess ID of the task that uses that vma as stack, while the process\nstack is marked as [stack].\n\nSo /proc/PID/maps will look like this:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack:1442]\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nThus marking all vmas that are used as stacks by the threads in the\nthread group along with the process stack. The task level maps will\nhowever like this:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack]\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nwhere only the vma that is being used as a stack by *that* task is\nmarked as [stack].\n\nAnalogous changes have been made to /proc/PID/smaps,\n/proc/PID/numa_maps, /proc/PID/task/TID/smaps and\n/proc/PID/task/TID/numa_maps. Relevant snippets from smaps and\nnuma_maps:\n\n [siddhesh@localhost ~ ]$ pgrep a.out\n 1441\n [siddhesh@localhost ~ ]$ cat /proc/1441/smaps | grep \"\\[stack\"\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack:1442]\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1442/smaps | grep \"\\[stack\"\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1441/smaps | grep \"\\[stack\"\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/numa_maps | grep \"stack\"\n 7f8a44492000 default stack:1442 anon\u003d2 dirty\u003d2 N0\u003d2\n 7fff6273a000 default stack anon\u003d3 dirty\u003d3 N0\u003d3\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1442/numa_maps | grep \"stack\"\n 7f8a44492000 default stack anon\u003d2 dirty\u003d2 N0\u003d2\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1441/numa_maps | grep \"stack\"\n 7fff6273a000 default stack anon\u003d3 dirty\u003d3 N0\u003d3\n\n[akpm@linux-foundation.org: checkpatch fixes]\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Siddhesh Poyarekar \u003csiddhesh.poyarekar@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Jamie Lokier \u003cjamie@shareable.org\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "092b50bacd1cdbffef2643b7a46f2a215407919c", "tree": "a2501b424d37c3757e9369ac36231874756bf990", "parents": [ "807f0ccfe15551afd514c062585045c88ca62037" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "pagemap: introduce data structure for pagemap entry\n\nCurrently a local variable of pagemap entry in pagemap_pte_range() is\nnamed pfn and typed with u64, but it\u0027s not correct (pfn should be unsigned\nlong.)\n\nThis patch introduces special type for pagemap entries and replaces code\nwith it.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e873c49fbfdd595481976b915850e682441bcbec", "tree": "87ad5d125563d1eb6418e1f7b5a094fab6098108", "parents": [ "025c5b2451e42c9e8dfdecd6dc84956ce8f321b5" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "pagemap: export KPF_THP\n\nThis flag shows that a given page is a subpage of a transparent hugepage.\nIt helps us debug and test the kernel by showing physical address of thp.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nReviewed-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "025c5b2451e42c9e8dfdecd6dc84956ce8f321b5", "tree": "423b4ef1a0ce021360304a80f6e0ba902581a3ad", "parents": [ "5aaabe831eb527e0d9284f0745d830a755f70393" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "thp: optimize away unnecessary page table locking\n\nCurrently when we check if we can handle thp as it is or we need to split\nit into regular sized pages, we hold page table lock prior to check\nwhether a given pmd is mapping thp or not. Because of this, when it\u0027s not\n\"huge pmd\" we suffer from unnecessary lock/unlock overhead. To remove it,\nthis patch introduces a optimized check function and replace several\nsimilar logics with it.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5aaabe831eb527e0d9284f0745d830a755f70393", "tree": "2efdfe775da1c727c60ef5bd2d865d2150f68381", "parents": [ "b716ad953a2bc4a543143c1d9836b7007a4b182f" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "pagemap: avoid splitting thp when reading /proc/pid/pagemap\n\nThp split is not necessary if we explicitly check whether pmds are mapping\nthps or not. This patch introduces this check and adds code to generate\npagemap entries for pmds mapping thps, which results in less performance\nimpact of pagemap on thp.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4bfc130d5afa28395288d1b57092906349604b41", "tree": "947666e26c6f1e55b3ebdf5edcefda5019a65c8f", "parents": [ "aad6ec3777bf4930d4f7293745cc4c17a2d87947" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@linux.vnet.ibm.com", "time": "Wed Mar 21 16:33:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "hugetlbfs: fix hugetlb_get_unmapped_area()\n\nUse/update cached_hole_size and free_area_cache properly to speedup\nfinding of a free region.\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7904ac84244b59f536c2a5d1066a10f46df07b08", "tree": "82d9c44c26b52954884a70f1ae2b7fa78ea8e633", "parents": [ "dc716e96f5a467835e8121e1caaf25d66a901cb3" ], "author": { "name": "Earl Chew", "email": "echew@ixiacom.com", "time": "Wed Mar 21 16:33:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:54 2012 -0700" }, "message": "seq_file: fix mishandling of consecutive pread() invocations.\n\nThe following program illustrates the problem:\n\n char buf[8192];\n\n int fd \u003d open(\"/proc/self/maps\", O_RDONLY);\n\n n \u003d pread(fd, buf, sizeof(buf), 0);\n printf(\"%d\\n\", n);\n\n /* lseek(fd, 0, SEEK_CUR); */ /* Uncomment to work around */\n\n n \u003d pread(fd, buf, sizeof(buf), 0);\n printf(\"%d\\n\", n);\n\nThe second printf() prints zero, but uncommenting the lseek() corrects its\nbehaviour.\n\nTo fix, make seq_read() mirror seq_lseek() when processing changes in\n*ppos. Restore m-\u003eversion first, then if required traverse and update\nread_pos on success.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d11856\n\nSigned-off-by: Earl Chew \u003cechew@ixiacom.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1de5b41cd3b2474c2770b825266d372073e1b28b", "tree": "3968c179cc49ca60a425b7fe4b76808c0f0af9e0", "parents": [ "1a5a9906d4e8d1976b701f889d8f35d54b928f25" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Mar 21 16:33:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:54 2012 -0700" }, "message": "fs/namei.c: fix warnings on 32-bit\n\ni386 allnoconfig:\n\n fs/namei.c: In function \u0027has_zero\u0027:\n fs/namei.c:1617: warning: integer constant is too large for \u0027unsigned long\u0027 type\n fs/namei.c:1617: warning: integer constant is too large for \u0027unsigned long\u0027 type\n fs/namei.c: In function \u0027hash_name\u0027:\n fs/namei.c:1635: warning: integer constant is too large for \u0027unsigned long\u0027 type\n\nThere must be a tidier way of doing this.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a5a9906d4e8d1976b701f889d8f35d54b928f25", "tree": "e51912e725f224663a738045a4d0528d08da4572", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Mar 21 16:33:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:54 2012 -0700" }, "message": "mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode\n\nIn some cases it may happen that pmd_none_or_clear_bad() is called with\nthe mmap_sem hold in read mode. In those cases the huge page faults can\nallocate hugepmds under pmd_none_or_clear_bad() and that can trigger a\nfalse positive from pmd_bad() that will not like to see a pmd\nmaterializing as trans huge.\n\nIt\u0027s not khugepaged causing the problem, khugepaged holds the mmap_sem\nin write mode (and all those sites must hold the mmap_sem in read mode\nto prevent pagetables to go away from under them, during code review it\nseems vm86 mode on 32bit kernels requires that too unless it\u0027s\nrestricted to 1 thread per process or UP builds). The race is only with\nthe huge pagefaults that can convert a pmd_none() into a\npmd_trans_huge().\n\nEffectively all these pmd_none_or_clear_bad() sites running with\nmmap_sem in read mode are somewhat speculative with the page faults, and\nthe result is always undefined when they run simultaneously. This is\nprobably why it wasn\u0027t common to run into this. For example if the\nmadvise(MADV_DONTNEED) runs zap_page_range() shortly before the page\nfault, the hugepage will not be zapped, if the page fault runs first it\nwill be zapped.\n\nAltering pmd_bad() not to error out if it finds hugepmds won\u0027t be enough\nto fix this, because zap_pmd_range would then proceed to call\nzap_pte_range (which would be incorrect if the pmd become a\npmd_trans_huge()).\n\nThe simplest way to fix this is to read the pmd in the local stack\n(regardless of what we read, no need of actual CPU barriers, only\ncompiler barrier needed), and be sure it is not changing under the code\nthat computes its value. Even if the real pmd is changing under the\nvalue we hold on the stack, we don\u0027t care. If we actually end up in\nzap_pte_range it means the pmd was not none already and it was not huge,\nand it can\u0027t become huge from under us (khugepaged locking explained\nabove).\n\nAll we need is to enforce that there is no way anymore that in a code\npath like below, pmd_trans_huge can be false, but pmd_none_or_clear_bad\ncan run into a hugepmd. The overhead of a barrier() is just a compiler\ntweak and should not be measurable (I only added it for THP builds). I\ndon\u0027t exclude different compiler versions may have prevented the race\ntoo by caching the value of *pmd on the stack (that hasn\u0027t been\nverified, but it wouldn\u0027t be impossible considering\npmd_none_or_clear_bad, pmd_bad, pmd_trans_huge, pmd_none are all inlines\nand there\u0027s no external function called in between pmd_trans_huge and\npmd_none_or_clear_bad).\n\n\t\tif (pmd_trans_huge(*pmd)) {\n\t\t\tif (next-addr !\u003d HPAGE_PMD_SIZE) {\n\t\t\t\tVM_BUG_ON(!rwsem_is_locked(\u0026tlb-\u003emm-\u003emmap_sem));\n\t\t\t\tsplit_huge_page_pmd(vma-\u003evm_mm, pmd);\n\t\t\t} else if (zap_huge_pmd(tlb, vma, pmd, addr))\n\t\t\t\tcontinue;\n\t\t\t/* fall through */\n\t\t}\n\t\tif (pmd_none_or_clear_bad(pmd))\n\nBecause this race condition could be exercised without special\nprivileges this was reported in CVE-2012-1179.\n\nThe race was identified and fully explained by Ulrich who debugged it.\nI\u0027m quoting his accurate explanation below, for reference.\n\n\u003d\u003d\u003d\u003d\u003d\u003d start quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n mapcount 0 page_mapcount 1\n kernel BUG at mm/huge_memory.c:1384!\n\n At some point prior to the panic, a \"bad pmd ...\" message similar to the\n following is logged on the console:\n\n mm/memory.c:145: bad pmd ffff8800376e1f98(80000000314000e7).\n\n The \"bad pmd ...\" message is logged by pmd_clear_bad() before it clears\n the page\u0027s PMD table entry.\n\n 143 void pmd_clear_bad(pmd_t *pmd)\n 144 {\n -\u003e 145 pmd_ERROR(*pmd);\n 146 pmd_clear(pmd);\n 147 }\n\n After the PMD table entry has been cleared, there is an inconsistency\n between the actual number of PMD table entries that are mapping the page\n and the page\u0027s map count (_mapcount field in struct page). When the page\n is subsequently reclaimed, __split_huge_page() detects this inconsistency.\n\n 1381 if (mapcount !\u003d page_mapcount(page))\n 1382 printk(KERN_ERR \"mapcount %d page_mapcount %d\\n\",\n 1383 mapcount, page_mapcount(page));\n -\u003e 1384 BUG_ON(mapcount !\u003d page_mapcount(page));\n\n The root cause of the problem is a race of two threads in a multithreaded\n process. Thread B incurs a page fault on a virtual address that has never\n been accessed (PMD entry is zero) while Thread A is executing an madvise()\n system call on a virtual address within the same 2 MB (huge page) range.\n\n virtual address space\n .---------------------.\n | |\n | |\n .-|---------------------|\n | | |\n | | |\u003c-- B(fault)\n | | |\n 2 MB | |/////////////////////|-.\n huge \u003c |/////////////////////| \u003e A(range)\n page | |/////////////////////|-\u0027\n | | |\n | | |\n \u0027-|---------------------|\n | |\n | |\n \u0027---------------------\u0027\n\n - Thread A is executing an madvise(..., MADV_DONTNEED) system call\n on the virtual address range \"A(range)\" shown in the picture.\n\n sys_madvise\n // Acquire the semaphore in shared mode.\n down_read(\u0026current-\u003emm-\u003emmap_sem)\n ...\n madvise_vma\n switch (behavior)\n case MADV_DONTNEED:\n madvise_dontneed\n zap_page_range\n unmap_vmas\n unmap_page_range\n zap_pud_range\n zap_pmd_range\n //\n // Assume that this huge page has never been accessed.\n // I.e. content of the PMD entry is zero (not mapped).\n //\n if (pmd_trans_huge(*pmd)) {\n // We don\u0027t get here due to the above assumption.\n }\n //\n // Assume that Thread B incurred a page fault and\n .---------\u003e // sneaks in here as shown below.\n | //\n | if (pmd_none_or_clear_bad(pmd))\n | {\n | if (unlikely(pmd_bad(*pmd)))\n | pmd_clear_bad\n | {\n | pmd_ERROR\n | // Log \"bad pmd ...\" message here.\n | pmd_clear\n | // Clear the page\u0027s PMD entry.\n | // Thread B incremented the map count\n | // in page_add_new_anon_rmap(), but\n | // now the page is no longer mapped\n | // by a PMD entry (-\u003e inconsistency).\n | }\n | }\n |\n v\n - Thread B is handling a page fault on virtual address \"B(fault)\" shown\n in the picture.\n\n ...\n do_page_fault\n __do_page_fault\n // Acquire the semaphore in shared mode.\n down_read_trylock(\u0026mm-\u003emmap_sem)\n ...\n handle_mm_fault\n if (pmd_none(*pmd) \u0026\u0026 transparent_hugepage_enabled(vma))\n // We get here due to the above assumption (PMD entry is zero).\n do_huge_pmd_anonymous_page\n alloc_hugepage_vma\n // Allocate a new transparent huge page here.\n ...\n __do_huge_pmd_anonymous_page\n ...\n spin_lock(\u0026mm-\u003epage_table_lock)\n ...\n page_add_new_anon_rmap\n // Here we increment the page\u0027s map count (starts at -1).\n atomic_set(\u0026page-\u003e_mapcount, 0)\n set_pmd_at\n // Here we set the page\u0027s PMD entry which will be cleared\n // when Thread A calls pmd_clear_bad().\n ...\n spin_unlock(\u0026mm-\u003epage_table_lock)\n\n The mmap_sem does not prevent the race because both threads are acquiring\n it in shared mode (down_read). Thread B holds the page_table_lock while\n the page\u0027s map count and PMD table entry are updated. However, Thread A\n does not synchronize on that lock.\n\n\u003d\u003d\u003d\u003d\u003d\u003d end quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\n[akpm@linux-foundation.org: checkpatch fixes]\nReported-by: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nAcked-by: Larry Woodman \u003clwoodman@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t\t[2.6.38+]\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "30d73f375238441d6dc31de0d90bc39f5bb0bfe5", "tree": "0a94e144fbb7d3fa84c443fb6cc61f2f01f61a1b", "parents": [ "e2a0883e4071237d09b604a342c28b96b44a04b3", "1b189b8889b7d8e0bddc2655d171c43cfd344157" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:54:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:54:22 2012 -0700" }, "message": "Merge tag \u0027dlm-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm\n\nPull dlm updates for 3.4 from David Teigland:\n \"This set includes one trivial fix, and one simple recovery speed up.\n Directory recovery can use the standard hash table to find resources\n rather than always searching the linear recovery list.\"\n\n* tag \u0027dlm-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:\n dlm: last element of dlm_local_addr[] never used\n dlm: fix slow rsb search in dir recovery\n" }, { "commit": "e2a0883e4071237d09b604a342c28b96b44a04b3", "tree": "aa56f4d376b5eb1c32358c19c2669c2a94e0e1fd", "parents": [ "3a990a52f9f25f45469e272017a31e7a3fda60ed", "07c0c5d8b8c122b2f2df9ee574ac3083daefc981" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs pile 1 from Al Viro:\n \"This is _not_ all; in particular, Miklos\u0027 and Jan\u0027s stuff is not there\n yet.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)\n ext4: initialization of ext4_li_mtx needs to be done earlier\n debugfs-related mode_t whack-a-mole\n hfsplus: add an ioctl to bless files\n hfsplus: change finder_info to u32\n hfsplus: initialise userflags\n qnx4: new helper - try_extent()\n qnx4: get rid of qnx4_bread/qnx4_getblk\n take removal of PF_FORKNOEXEC to flush_old_exec()\n trim includes in inode.c\n um: uml_dup_mmap() relies on -\u003emmap_sem being held, but activate_mm() doesn\u0027t hold it\n um: embed -\u003estub_pages[] into mmu_context\n gadgetfs: list_for_each_safe() misuse\n ocfs2: fix leaks on failure exits in module_init\n ecryptfs: make register_filesystem() the last potential failure exit\n ntfs: forgets to unregister sysctls on register_filesystem() failure\n logfs: missing cleanup on register_filesystem() failure\n jfs: mising cleanup on register_filesystem() failure\n make configfs_pin_fs() return root dentry on success\n configfs: configfs_create_dir() has parent dentry in dentry-\u003ed_parent\n configfs: sanitize configfs_create()\n ...\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "c7c66c0cb0c77b1a8edf09bca57d922312d58030", "tree": "77277103c5f16aa4dee64978a060933d92e14776", "parents": [ "9f3938346a5c1fa504647670edb5fea5756cfb00", "98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:15:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:15:51 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management updates for 3.4 from Rafael Wysocki:\n \"Assorted extensions and fixes including:\n\n * Introduction of early/late suspend/hibernation device callbacks.\n * Generic PM domains extensions and fixes.\n * devfreq updates from Axel Lin and MyungJoo Ham.\n * Device PM QoS updates.\n * Fixes of concurrency problems with wakeup sources.\n * System suspend and hibernation fixes.\"\n\n* tag \u0027pm-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (43 commits)\n PM / Domains: Check domain status during hibernation restore of devices\n PM / devfreq: add relation of recommended frequency.\n PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()\n PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()\n PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()\n PM / Domains: Introduce \"always on\" device flag\n PM / Domains: Fix hibernation restore of devices, v2\n PM / Domains: Fix handling of wakeup devices during system resume\n sh_mmcif / PM: Use PM QoS latency constraint\n tmio_mmc / PM: Use PM QoS latency constraint\n PM / QoS: Make it possible to expose PM QoS latency constraints\n PM / Sleep: JBD and JBD2 missing set_freezable()\n PM / Domains: Fix include for PM_GENERIC_DOMAINS\u003dn case\n PM / Freezer: Remove references to TIF_FREEZE in comments\n PM / Sleep: Add more wakeup source initialization routines\n PM / Hibernate: Enable usermodehelpers in hibernate() error path\n PM / Sleep: Make __pm_stay_awake() delete wakeup source timers\n PM / Sleep: Fix race conditions related to wakeup source timer function\n PM / Sleep: Fix possible infinite loop during wakeup source destruction\n PM / Hibernate: print physical addresses consistently with other parts of kernel\n ...\n" }, { "commit": "3dd933061d3a4f33fb6ba1616e88fa55a8b8cb9c", "tree": "3bd8ecc805ed40af32ba71f6b59baece59337ba7", "parents": [ "815465c4d724e851932843227b4b700d64216cf2" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Wed Mar 21 06:27:55 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:55:48 2012 -0500" }, "message": "cifs: clean up ordering in exit_cifs\n\n...ensure that we undo things in the reverse order from the way they\nwere done. In truth, the ordering doesn\u0027t matter for a lot of these,\nbut it\u0027s still better to do it that way to be sure.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "815465c4d724e851932843227b4b700d64216cf2", "tree": "1ca2e93dad7d66fe8d63d2f9c87ad6f6e3c34239", "parents": [ "6dae51a585008535858c29b489dbf90a913d511b" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Wed Mar 21 06:27:54 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:55:44 2012 -0500" }, "message": "cifs: clean up call to cifs_dfs_release_automount_timer()\n\nTake the #ifdef junk out of the code, and turn it into a noop macro\nwhen CONFIG_CIFS_DFS_UPCALL isn\u0027t defined.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "9f3938346a5c1fa504647670edb5fea5756cfb00", "tree": "7cf6d24d6b076c8db8571494984924cac03703a2", "parents": [ "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "317b6e128247f75976b0fc2b9fd8d2c20ef13b3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "message": "Merge branch \u0027kmap_atomic\u0027 of git://github.com/congwang/linux\n\nPull kmap_atomic cleanup from Cong Wang.\n\nIt\u0027s been in -next for a long time, and it gets rid of the (no longer\nused) second argument to k[un]map_atomic().\n\nFix up a few trivial conflicts in various drivers, and do an \"evil\nmerge\" to catch some new uses that have come in since Cong\u0027s tree.\n\n* \u0027kmap_atomic\u0027 of git://github.com/congwang/linux: (59 commits)\n feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal\n highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n drbd: remove the second argument of k[un]map_atomic()\n zcache: remove the second argument of k[un]map_atomic()\n gma500: remove the second argument of k[un]map_atomic()\n dm: remove the second argument of k[un]map_atomic()\n tomoyo: remove the second argument of k[un]map_atomic()\n sunrpc: remove the second argument of k[un]map_atomic()\n rds: remove the second argument of k[un]map_atomic()\n net: remove the second argument of k[un]map_atomic()\n mm: remove the second argument of k[un]map_atomic()\n lib: remove the second argument of k[un]map_atomic()\n power: remove the second argument of k[un]map_atomic()\n kdb: remove the second argument of k[un]map_atomic()\n udf: remove the second argument of k[un]map_atomic()\n ubifs: remove the second argument of k[un]map_atomic()\n squashfs: remove the second argument of k[un]map_atomic()\n reiserfs: remove the second argument of k[un]map_atomic()\n ocfs2: remove the second argument of k[un]map_atomic()\n ntfs: remove the second argument of k[un]map_atomic()\n ...\n" }, { "commit": "6dae51a585008535858c29b489dbf90a913d511b", "tree": "64a5bfd5d14946ef8e36a90b37d7057364d5f542", "parents": [ "bc205ed19bdb56576b291830bc3f752aef5e3923" ], "author": { "name": "Pavel Shilovsky", "email": "piastry@etersoft.ru", "time": "Tue Feb 21 16:50:23 2012 +0300" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:35:38 2012 -0500" }, "message": "CIFS: Delete echo_retries module parm\n\nIt\u0027s the essential step before respecting MaxMpxCount value during\nnegotiating because we will keep only one extra slot for sending\necho requests. If there is no response during two echo intervals -\nreconnect the tcp session.\n\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "bc205ed19bdb56576b291830bc3f752aef5e3923", "tree": "abdda57d027c601d40027572b2d070b9432670a2", "parents": [ "5bc594982f49220d33e927e3c9e028bf87b4745c" ], "author": { "name": "Pavel Shilovsky", "email": "piastry@etersoft.ru", "time": "Thu Mar 15 13:22:27 2012 +0300" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:35:36 2012 -0500" }, "message": "CIFS: Prepare credits code for a slot reservation\n\nthat is essential for CIFS/SMB/SMB2 oplock breaks and SMB2 echos.\n\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "5bc594982f49220d33e927e3c9e028bf87b4745c", "tree": "6e72c2937250744309d5f3d514c5a5b48a5f6663", "parents": [ "2d86dbc97094ea4cfc2204fdefd7d07685496189" ], "author": { "name": "Pavel Shilovsky", "email": "piastry@etersoft.ru", "time": "Tue Feb 21 19:56:08 2012 +0300" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:35:32 2012 -0500" }, "message": "CIFS: Make wait_for_free_request killable\n\nto let us kill the proccess if it hangs waiting for a credit when\nthe session is down and echo is disabled.\n\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "2d86dbc97094ea4cfc2204fdefd7d07685496189", "tree": "9aee614e155fd837c78ded2cd083dead1a9d4a3f", "parents": [ "fc40f9cf828908e91d9af820e9300a9d42fbbd72" ], "author": { "name": "Pavel Shilovsky", "email": "piastry@etersoft.ru", "time": "Mon Feb 06 15:59:18 2012 +0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:35:03 2012 -0500" }, "message": "CIFS: Introduce credit-based flow control\n\nand send no more than credits value requests at once. For SMB/CIFS\nit\u0027s trivial: increment this value by receiving any message and\ndecrement by sending one.\n\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "fc40f9cf828908e91d9af820e9300a9d42fbbd72", "tree": "1d0aa12f099ea9c759321d5e75967e152fcf4b11", "parents": [ "1daaae8fa4afe3df78ca34e724ed7e8187e4eb32" ], "author": { "name": "Pavel Shilovsky", "email": "piastry@etersoft.ru", "time": "Fri Feb 17 17:09:12 2012 +0300" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:27:35 2012 -0500" }, "message": "CIFS: Simplify inFlight logic\n\nby making it as unsigned integer and surround access with req_lock\nfrom server structure.\n\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "1daaae8fa4afe3df78ca34e724ed7e8187e4eb32", "tree": "89e445c3fab48ac07aea3ea38b8f0e3d0093dd8b", "parents": [ "10b9b98e41ba248a899f6175ce96ee91431b6194" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Wed Mar 21 06:30:40 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed Mar 21 11:26:14 2012 -0500" }, "message": "cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next\n\nThis patch fixes an issue when cifs_mount receives a\nSTATUS_BAD_NETWORK_NAME error during cifs_get_tcon but is able to\ncontinue after an DFS ROOT referral. In this case, the return code\nvariable is not reset prior to trying to mount from the system referred\nto. Thus, is_path_accessible is not executed and the final DFS referral\nis not performed causing a mount error.\n\nUse case: In DNS, example.com resolves to the secondary AD server\nad2.example.com Our primary domain controller is ad1.example.com and has\na DFS redirection set up from \\\\ad1\\share\\Users to \\\\files\\share\\Users.\nMounting \\\\example.com\\share\\Users fails.\n\nRegression introduced by commit 724d9f1.\n\nCc: stable@vger.kernel.org\nReviewed-by: Pavel Shilovsky \u003cpiastry@etersoft.ru\nSigned-off-by: Thomas Hadig \u003cthomas@intapp.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "5a7c9eec9fde1da0e3adf0a4ddb64ff2a324a492", "tree": "f6ca94e7356996f9e29d6baa0fea67d3a499f9f0", "parents": [ "9b78145c0f280d4f01c460d6251eab2584181fa9" ], "author": { "name": "Vivek Trivedi", "email": "vtrivedi018@gmail.com", "time": "Thu Mar 15 23:58:52 2012 +0530" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 11:45:28 2012 -0400" }, "message": "NFS: fix sb-\u003es_id in nfs debug prints\n\nNFS bdi flush thread in ps output is printed like \"flush-\u003cmajor number\nin decimal\u003e:\u003cminor number in decimal\u003e\"\nFor example:\n$ ps aux | grep flush\n 2079 root 0 SW [flush-0:18]\n ^^^^\n\nnfs_bdi_register()\n\u003d\u003d\u003e bdi_register_dev()\n\u003d\u003d\u003e bdi_register(bdi, NULL, \"%u:%u\", MAJOR(dev), MINOR(dev));\n ^^^^^\n\nHowever, NFS sb-\u003es_id store major:minor number in hex:\n\nnfs_initialise_sb()\n\u003d\u003d\u003e snprintf(sb-\u003es_id, sizeof(sb-\u003es_id),\n \"%x:%x\", MAJOR(sb-\u003es_dev), MINOR(sb-\u003es_dev));\n ^^^^^\n\nIf we enable nfs debug prints using command:\n$ rpcdebug -m nfs -s all\n\nwrite to a file:\n$ dd if\u003d/dev/zero of\u003d\u003cNFS Mount\u003e/testfile.txt bs\u003d32768 count\u003d1\n\nWithout Patch:\n[ 2431.032000] NFS: 0 initiated write call (req 0:12/40, 32768 bytes\n@ offset 0) ^^^^\n\nWith Patch:\n[ 2431.032000] NFS: 0 initiated write call (req 0:18/40, 32768 bytes\n@ offset 0) ^^^^\n\nWe should store NFS \"s-\u003es_id\" in decimal to avoid confusion between NFS\nflush thread name(in ps output) and NFS debug prints.\n\nSigned-off-by: Vivek Trivedi \u003cvtrivedi018@gmail.com\u003e\nSigned-off-by: Namjae Jeon \u003clinkinjeon@gmail.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "1b189b8889b7d8e0bddc2655d171c43cfd344157", "tree": "ebd751e8f336044299b1039520893a7b92651cee", "parents": [ "7210cb7a72a22303cdb225bd1aea28697a17bbae" ], "author": { "name": "David Teigland", "email": "teigland@redhat.com", "time": "Wed Mar 21 09:18:34 2012 -0500" }, "committer": { "name": "David Teigland", "email": "teigland@redhat.com", "time": "Wed Mar 21 09:18:34 2012 -0500" }, "message": "dlm: last element of dlm_local_addr[] never used\n\nThe last element of dlm_local_addr[DLM_MAX_ADDR_COUNT]\nwas not used because the loop ended at COUNT - 1.\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David Teigland \u003cteigland@redhat.com\u003e\n" }, { "commit": "18d98f6c04991dd3c12acf6f39cea40e9510640a", "tree": "2057833de8c2c6bb4e3530eed44249b3941b99d8", "parents": [ "c6bfa1a16377b42496ecc0490a33516c0e414e7b" ], "author": { "name": "Sachin Bhamare", "email": "sbhamare@panasas.com", "time": "Mon Mar 19 20:47:58 2012 -0700" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:47 2012 -0400" }, "message": "pnfs-obj: autologin: Add support for protocol autologin\n\nThe pnfs-objects protocol mandates that we autologin into devices not\npresent in the system, according to information specified in the\nget_device_info returned from the server.\n\nThe Protocol specifies two login hints.\n1. An IP address:port combination\n2. A string URI which is constructed as a URL with a protocol prefix\n followed by :// and a string as address. For each protocol prefix\n the string-address format might be different.\n\nWe only support the second option. The first option is just redundant\nto the second one.\nNOTE: The Kernel part of autologin does not parse the URI string. It\njust channels it to a user-mode script. So any new login protocols should\nonly update the user-mode script which is a part of the nfs-utils package,\nbut the Kernel need not change.\n\nWe implement the autologin by using the call_usermodehelper() API.\n(Thanks to Steve Dickson \u003csteved@redhat.com\u003e for pointing it out)\nSo there is no running daemon needed, and/or special setup.\n\nWe Add the osd_login_prog Kernel module parameters which defaults to:\n\t/sbin/osd_login\n\nKernel try\u0027s to upcall the program specified in osd_login_prog. If the file is\nnot found or the execution fails Kernel will disable any farther upcalls, by\nzeroing out osd_login_prog, Until Admin re-enables it by setting the\nosd_login_prog parameter to a proper program.\n\nAlso add text about the osd_login program command line API to:\n\tDocumentation/filesystems/nfs/pnfs.txt\nand documentation of the new osd_login_prog module parameter to:\n\tDocumentation/kernel-parameters.txt\n\nTODO: Add timeout option in the case osd_login program gets\n stuck\n\nSigned-off-by: Sachin Bhamare \u003csbhamare@panasas.com\u003e\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c6bfa1a16377b42496ecc0490a33516c0e414e7b", "tree": "a45bb649475733474350d1420b6cb1079020b8f2", "parents": [ "34e137cc7e3b63c254875e59cd48dcbe6757fe6c" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Mon Mar 19 14:54:42 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:46 2012 -0400" }, "message": "NFS: Remove nfs4_setup_sequence from generic rename code\n\nThis is an NFS v4 specific operation, so it belongs in the NFS v4 code\nand not the generic client.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "34e137cc7e3b63c254875e59cd48dcbe6757fe6c", "tree": "ea509e7f715bcbf2fd3541062063348f547e6c6c", "parents": [ "ea7c330362257c072791aeaf03bae2cebf9fb984" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Mon Mar 19 14:54:41 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:46 2012 -0400" }, "message": "NFS: Remove nfs4_setup_sequence from generic unlink code\n\nThis is an NFS v4 specific operation, so it belongs in the NFS v4 code\nand not the generic client.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ea7c330362257c072791aeaf03bae2cebf9fb984", "tree": "5633ea3278a8ad9b81891bd1fd149af76ad3fe7d", "parents": [ "c6cb80d00be42f30716ec817b963bcec094433b5" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Mon Mar 19 14:54:40 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:45 2012 -0400" }, "message": "NFS: Remove nfs4_setup_sequence from generic read code\n\nThis is an NFS v4 specific operation, so it belongs in the NFS v4 code\nand not the generic client.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c6cb80d00be42f30716ec817b963bcec094433b5", "tree": "8049071fc2c5f01a730eb47bfa95ee095ce677df", "parents": [ "6f00866ddd15724eb20eac4ddf6e2c6c1a6cfcdc" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Mon Mar 19 14:54:39 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:45 2012 -0400" }, "message": "NFS: Remove nfs4_setup_sequence from generic write code\n\nThis is an NFS v4 specific operation, so it belongs in the NFS v4 code\nand not the generic client.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6f00866ddd15724eb20eac4ddf6e2c6c1a6cfcdc", "tree": "14c33fa0d8dfe765175c3972d1fd746ef766c150", "parents": [ "ffa94db6042e6fd014ae0bed8832ac707ef2afe9" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 20 14:12:46 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:44 2012 -0400" }, "message": "NFS: Fix more NFS debug related build warnings\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "ffa94db6042e6fd014ae0bed8832ac707ef2afe9", "tree": "c2e98dc23546be53b311bf4eb010e824709e4d76", "parents": [ "9304a8120a6ac06d08874d2aec76f52d3376dfe4" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Mar 20 09:22:00 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Mar 21 09:31:44 2012 -0400" }, "message": "SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined\n\nStephen Rothwell reports:\nnet/sunrpc/rpcb_clnt.c: In function \u0027rpcb_enc_mapping\u0027:\nnet/sunrpc/rpcb_clnt.c:820:19: warning: unused variable \u0027task\u0027 [-Wunused-variable]\nnet/sunrpc/rpcb_clnt.c: In function \u0027rpcb_dec_getport\u0027:\nnet/sunrpc/rpcb_clnt.c:837:19: warning: unused variable \u0027task\u0027 [-Wunused-variable]\nnet/sunrpc/rpcb_clnt.c: In function \u0027rpcb_dec_set\u0027:\nnet/sunrpc/rpcb_clnt.c:860:19: warning: unused variable \u0027task\u0027 [-Wunused-variable]\nnet/sunrpc/rpcb_clnt.c: In function \u0027rpcb_enc_getaddr\u0027:\nnet/sunrpc/rpcb_clnt.c:892:19: warning: unused variable \u0027task\u0027 [-Wunused-variable]\nnet/sunrpc/rpcb_clnt.c: In function \u0027rpcb_dec_getaddr\u0027:\nnet/sunrpc/rpcb_clnt.c:914:19: warning: unused variable \u0027task\u0027 [-Wunused-variable]\nfs/lockd/svclock.c:49:20: warning: \u0027nlmdbg_cookie2a\u0027 declared \u0027static\u0027 but never defined [-Wunused-function]\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "07c0c5d8b8c122b2f2df9ee574ac3083daefc981", "tree": "042fcae9a90b5e200b9c00c32df8096c8099039c", "parents": [ "88187398cc5fa6650f38b9dcd5464667f468888f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 22:05:02 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 22:05:02 2012 -0400" }, "message": "ext4: initialization of ext4_li_mtx needs to be done earlier\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "88187398cc5fa6650f38b9dcd5464667f468888f", "tree": "eb9d45cdbe4506340b1131951bc7f2dba2f2a796", "parents": [ "a051f71ce97c53cde3ac64de64eb02d658d9308e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 06:00:24 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:53 2012 -0400" }, "message": "debugfs-related mode_t whack-a-mole\n\nall of those should be umode_t...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a051f71ce97c53cde3ac64de64eb02d658d9308e", "tree": "ef36c0a2e8c9e9dfb97ee12ba35fccca32858909", "parents": [ "0347b6e95ceeb648631f89a0ced001e90e4daaa9" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Mon Feb 06 15:14:40 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:53 2012 -0400" }, "message": "hfsplus: add an ioctl to bless files\n\nMaking an hfsplus partition bootable requires the ability to \"bless\" a\nfile by putting its inode number in the volume header. Doing this from\nuserspace on a mounted filesystem is impractical since the kernel will\nwrite back the original values on unmount. Add an ioctl to allow userspace\nto update the volume header information based on the target file.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0347b6e95ceeb648631f89a0ced001e90e4daaa9", "tree": "d9af87bb6280d935f9ba628899e8494d25de7c81", "parents": [ "f3922382ce930e76773fb06416a7a6081a8702ad" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu Feb 02 15:39:50 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:52 2012 -0400" }, "message": "hfsplus: change finder_info to u32\n\nThe finder_info block in the hfsplus volume header is currently defined as\nan array of 8 bit values, but TN1150 defines it as being an array of 32 bit\nvalues. Fix for convenience.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f3922382ce930e76773fb06416a7a6081a8702ad", "tree": "41de4a013a7d0686403da8a37880644cc3390b81", "parents": [ "7cd916f6ea86e8538b1e8136847dfb941813fe94" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Tue Mar 13 12:10:34 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:52 2012 -0400" }, "message": "hfsplus: initialise userflags\n\nThe userflags field was being written to the filesystem without being\ninitialised. Make sure it\u0027s clear, since otherwise files end up with\ngarbage attributes.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7cd916f6ea86e8538b1e8136847dfb941813fe94", "tree": "4373e84fd6953fedd1015478c9b945ef39909a96", "parents": [ "8f82ecae53347ec65721e1c0683c3f26647e3c97" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Feb 14 17:48:20 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:52 2012 -0400" }, "message": "qnx4: new helper - try_extent()\n\nchecking if an extent is the one we are looking for is done twice\nin qnx4_block_map(); gather that code into a helper function.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8f82ecae53347ec65721e1c0683c3f26647e3c97", "tree": "594d1064acfda1f44aa4eaf0a2fde01ada760b2c", "parents": [ "19e5109fef2c368ab3f8a5157270f87f4a7c0326" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Feb 13 20:57:12 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:51 2012 -0400" }, "message": "qnx4: get rid of qnx4_bread/qnx4_getblk\n\npointless, since the only caller will want the physical block\nnumber anyway; might as well call qnx4_block_map() and use\nsb_bread()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "19e5109fef2c368ab3f8a5157270f87f4a7c0326", "tree": "31142f922de19cedfe45f0caa660a6d58674d8cc", "parents": [ "e59cc473cc603d562f2c80c12c943ef2a8cde6b2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Feb 23 22:29:17 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:51 2012 -0400" }, "message": "take removal of PF_FORKNOEXEC to flush_old_exec()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "e59cc473cc603d562f2c80c12c943ef2a8cde6b2", "tree": "14030457a2322175a899afa14d3ad0de23942e7d", "parents": [ "ac2aca2817ca10ad30f86d0d3caa41ea8cc4f0f0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 07 13:17:19 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:51 2012 -0400" }, "message": "trim includes in inode.c\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "342827d7d19cb52b562bb3efeb4d4b672d008c35", "tree": "92b2155e8febaf9a9e5caad01f5929d9f63bcd11", "parents": [ "0794f569ec307dc25bbb12456ef75aa71f72f744" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 22:03:58 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:49 2012 -0400" }, "message": "ocfs2: fix leaks on failure exits in module_init\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0794f569ec307dc25bbb12456ef75aa71f72f744", "tree": "3b3d090c3ca8cdf64cff3531ac4b855f7ebee592", "parents": [ "f4c5499d2cbe54f0470764acfd0faf4e965aa7e9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 21:29:13 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:49 2012 -0400" }, "message": "ecryptfs: make register_filesystem() the last potential failure exit\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f4c5499d2cbe54f0470764acfd0faf4e965aa7e9", "tree": "33028adf1123e4fec8ff8f63c8bc9a7fd1cc4111", "parents": [ "03e897a1edb9604c299e1a7646ade0ca90fe1e02" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 18:19:57 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:49 2012 -0400" }, "message": "ntfs: forgets to unregister sysctls on register_filesystem() failure\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "03e897a1edb9604c299e1a7646ade0ca90fe1e02", "tree": "56b8be4804943a5641bc804e38c8a6983c0018ba", "parents": [ "76bf09fcf76da1a2d777d9827d5a0a6a4cec0dcb" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 18:16:24 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:48 2012 -0400" }, "message": "logfs: missing cleanup on register_filesystem() failure\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "76bf09fcf76da1a2d777d9827d5a0a6a4cec0dcb", "tree": "3408929c3dbd5ab3e765258ef000765daa1bccdd", "parents": [ "2a152ad3a58508b06b9e0482e68117a79bbb27ce" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 18:14:34 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:48 2012 -0400" }, "message": "jfs: mising cleanup on register_filesystem() failure\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2a152ad3a58508b06b9e0482e68117a79bbb27ce", "tree": "fd80467e9b4cbeb163eb58239e9400c22946ef84", "parents": [ "0dd6c08a0042ed83037cf5c772d9066e33046427" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 16:53:29 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:48 2012 -0400" }, "message": "make configfs_pin_fs() return root dentry on success\n\n... and make configfs_mnt static\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0dd6c08a0042ed83037cf5c772d9066e33046427", "tree": "9f29ab8ce7c2a5e44b5c1b706ff8fc3ff2dfd6c6", "parents": [ "16d13b59b5b85ebc91de6c889716fa6e7766237f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 16:49:20 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:47 2012 -0400" }, "message": "configfs: configfs_create_dir() has parent dentry in dentry-\u003ed_parent\n\nno need to play sick games with parent item, internal mount, etc.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "16d13b59b5b85ebc91de6c889716fa6e7766237f", "tree": "00f9028147e5989f5368c4bbff6f219fafad7146", "parents": [ "b7c177fcd2022ca8572284deb8f9b6ab5730eafb" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 16:41:55 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:47 2012 -0400" }, "message": "configfs: sanitize configfs_create()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b7c177fcd2022ca8572284deb8f9b6ab5730eafb", "tree": "fe4c55e5c504d6db8de36336ecd0b493a7f71c46", "parents": [ "81d44ed159e3e81f7e62cee2d0fe68aae0c95e78" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 16:24:54 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:47 2012 -0400" }, "message": "configfs: kill configfs_sb\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "81d44ed159e3e81f7e62cee2d0fe68aae0c95e78", "tree": "4d6d02a6d57d547e53ffa0cfb6c54acc3e4c630f", "parents": [ "8fc3dc5a3a17aa2b353886422bd89420619af211" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 16:13:25 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:46 2012 -0400" }, "message": "configfs: don\u0027t bother with checks for mkdir/rmdir/unlink/symlink in root\n\njust give root directory separate inode_operations without all those\nmethods...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8fc3dc5a3a17aa2b353886422bd89420619af211", "tree": "74a3290ad9621ff1c225b772df2c529c8feb5f43", "parents": [ "54bf586e1f51018ba7624c851e7aa14cee0548d2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 03:05:16 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:46 2012 -0400" }, "message": "__register_binfmt() made void\n\nJust don\u0027t pass NULL to it - nobody does, anyway.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "54bf586e1f51018ba7624c851e7aa14cee0548d2", "tree": "5324f4c69bc03f0a60e83cfab0bfdffbc07932a7", "parents": [ "ca7068c41a8d48ef35d1a3bba422ebcedace8513" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 02:55:49 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:46 2012 -0400" }, "message": "autofs: set things up *before* registering fs type\n\nit\u0027s not a serious race, but we really want misc device before anybody\ngets to mount this sucker.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ca7068c41a8d48ef35d1a3bba422ebcedace8513", "tree": "2d555b4a30c576b42d2efa2736b3bbbe6dea2eba", "parents": [ "2226a288fac462ebc98e40da007842f92a7e4799" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 02:52:29 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:45 2012 -0400" }, "message": "anon_inodes: move allocation of anon_inode into -\u003emount()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2226a288fac462ebc98e40da007842f92a7e4799", "tree": "c4144c91b7f6830d442486e699b7eb7662a858ce", "parents": [ "01e0fe0b10d8673554525984947cc5de21492462" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 02:37:05 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:45 2012 -0400" }, "message": "9p: make register_filesystem() the last failure exit\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2452992aa78315bf0f510620d22fae8ecb40a2eb", "tree": "6189253c48aa4a40d07707bf406896833778c61c", "parents": [ "ea23b453103e7495ef0a90c86b92f27e17092bfa" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 02:13:52 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:44 2012 -0400" }, "message": "make simple_pin_fs() pass MS_KERNMOUNT - it\u0027s a kernel-internal one\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "765fd6b23d8b1130bd9e2c995040b137faa0992d", "tree": "6157a1716ce74ddb77657e08bc13c208dafd671f", "parents": [ "f466c6fdb3b1f043ff1977a8d2a1d0cd4dc164fa" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:19:24 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:43 2012 -0400" }, "message": "kill reiserfs_fs_{i,sb}.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f466c6fdb3b1f043ff1977a8d2a1d0cd4dc164fa", "tree": "4ebd1b27da5be1a77c6d095b2d0066ab8fb2c5e0", "parents": [ "a8a4b79b53fc7cbb023afedf58b04dd4e9bbb114" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:16:43 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:43 2012 -0400" }, "message": "move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a8a4b79b53fc7cbb023afedf58b04dd4e9bbb114", "tree": "1cc5ccdd1df89a6b166c9b93316e624f917a65e3", "parents": [ "a3063ab88fcbe5249f841cb95dfd626b8bf2674f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:06:11 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:43 2012 -0400" }, "message": "kill pointless includes of reiserfs_fs_{i,sb}.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a3063ab88fcbe5249f841cb95dfd626b8bf2674f", "tree": "bb3304f3317a4075cee2926b39867336cae708b0", "parents": [ "c45ac8887e778c4fa2b572c51a94a681a0955d4d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:03:10 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:42 2012 -0400" }, "message": "move reiserfs_acl.h to fs/reiserfs/acl.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" } ], "next": "c45ac8887e778c4fa2b572c51a94a681a0955d4d" }