)]}' { "log": [ { "commit": "df6b06575c0eb56089e9cf4164112696e51e8ae1", "tree": "122bf1ac54db241239697bf28e55fe4d911fc5f6", "parents": [ "da6c75e316ae37cd3c6712f6e2464d9833d3056f", "d9fd673ae915979d19dd302711cef56f987b8c0a" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Aug 28 04:07:23 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Wed Aug 28 04:07:21 2013 -0700" }, "message": "Merge \"sysctl: Don\u0027t scan for the leaks on headers\"" }, { "commit": "24a8d103190c0f03c6ed61d8934db62abe278c0e", "tree": "dbc33e38076403d253922ede8df1e08463ab6011", "parents": [ "c92bf15d5b9396aea0688af2e6c40b0bf076a226" ], "author": { "name": "xiaobing tu", "email": "xiaobing.tu@intel.com", "time": "Thu Jan 31 14:11:32 2013 +0800" }, "committer": { "name": "Srinivasarao P", "email": "spathi@codeaurora.org", "time": "Mon Aug 19 17:08:48 2013 +0530" }, "message": "seq_file: Allocate memory using vmalloc when kmalloc failed\n\nWhen dumpstate access /proc/xxx/binder, this binder include lots of info,\nit will use seq_read in kernel, in this function, it will trigger\nhigh order memory alloc, when read binder info or other large file,\nthis will cause memory presure when system don\u0027t have contious high order\nmemory, it will lead to high kswap workload to reclaim the page. so change\nkmalloc to vmalloc, it can avoid contiously high order memory allocating.\n\nCRs-fixed: 514982\n\nChange-Id: I463d5f72c24b7bb298e14b0da49c5fc96091ecc1\nPatch-mainline: linux-arm-kernel(lkml) @ Thu, 31 Jan 2013 14:11:32 +0800\nLink : https://lkml.org/lkml/2013/1/31/20\nSigned-off-by: Srinivasarao P \u003cspathi@codeaurora.org\u003e\n" }, { "commit": "d9fd673ae915979d19dd302711cef56f987b8c0a", "tree": "5f9789ba2221c876052b770cfd22197d32a3a01e", "parents": [ "52561f4ef8b94a164bbb714037ef74020cb04de6" ], "author": { "name": "Chintan Pandya", "email": "cpandya@codeaurora.org", "time": "Tue Jul 02 16:00:49 2013 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Fri Jul 12 00:39:20 2013 -0700" }, "message": "sysctl: Don\u0027t scan for the leaks on headers\n\nThese header allocations have life cycle till the device goes\nshutdown. So, considering them as leak is false positive. Remove\nthem by marking kmemleak_not_leak\n\nCRs-Fixed: 466552\nChange-Id: Id1571b78365e533ddfe866d45cef8f89b0b62bc7\nSigned-off-by: Chintan Pandya \u003ccpandya@codeaurora.org\u003e\n" }, { "commit": "a6c55a2b39c0d825cbd40592ea8a20a32d0c4a6b", "tree": "25d998e6b05d9ac57bb9542cf9e114648c2cf203", "parents": [ "89e97504239310efcec5a11d7c1d7bf8f9b44864" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Dec 21 00:15:51 2012 -0500" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Thu May 16 20:41:42 2013 -0700" }, "message": "jbd2: fix assertion failure in jbd2_journal_flush()\n\nThe following race is possible between start_this_handle() and someone\ncalling jbd2_journal_flush().\n\nProcess A Process B\nstart_this_handle().\n if (journal-\u003ej_barrier_count) # false\n if (!journal-\u003ej_running_transaction) { #true\n read_unlock(\u0026journal-\u003ej_state_lock);\n jbd2_journal_lock_updates()\n jbd2_journal_flush()\n write_lock(\u0026journal-\u003ej_state_lock);\n if (journal-\u003ej_running_transaction) {\n # false\n ... wait for committing trans ...\n write_unlock(\u0026journal-\u003ej_state_lock);\n ...\n write_lock(\u0026journal-\u003ej_state_lock);\n if (!journal-\u003ej_running_transaction) { # true\n jbd2_get_transaction(journal, new_transaction);\n write_unlock(\u0026journal-\u003ej_state_lock);\n goto repeat; # eventually blocks on j_barrier_count \u003e 0\n ...\n J_ASSERT(!journal-\u003ej_running_transaction);\n # fails\n\nWe fix the race by rechecking j_barrier_count after reacquiring j_state_lock\nin exclusive mode.\n\nReported-by: yjwsignal@empal.com\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: stable@vger.kernel.org\n\nCRs-Fixed: 468318\nChange-Id: Ibe417ee5c50e257b7521b5ce8bbfa4e13547d4c5\nGit-commit: d7961c7fa4d2e3c3f12be67e21ba8799b5a7238a\nGit-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\nSigned-off-by: Taniya Das \u003ctdas@codeaurora.org\u003e\n" }, { "commit": "733d861236661e6252afbb9ccb179d48f79334f3", "tree": "4edda9907fc715e98063a422b18ec1175423775f", "parents": [ "922b8422857516bf67a760a398327a96fbbfa6a9" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Mon Dec 17 18:33:37 2012 -0800" }, "committer": { "name": "Neha Pandey", "email": "nehap@codeaurora.org", "time": "Thu Dec 27 15:18:16 2012 -0800" }, "message": "mm: Use correct define for CMA features\n\nCMA features may ifdef out parts of the code with\nCONFIG_CMA. Older code uses CONFIG_DMA_CMA. Switch\nto using the newer CONFIG_CMA to ensure the code gets\ncompiled when needed.\n\nChange-Id: I3cae639797787b4926a6c5e057de973b66196707\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\nSigned-off-by: Neha Pandey \u003cnehap@codeaurora.org\u003e\n" }, { "commit": "afb2a33921982599d247a46b2306c75a4b69064b", "tree": "2f45339b88e75f754e1502469087b5eb2358d0a8", "parents": [ "d3c11452319e8e958cc7485fa78d7737429323dd" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Mon Dec 03 17:50:34 2012 -0800" }, "committer": { "name": "Mitchel Humpherys", "email": "mitchelh@codeaurora.org", "time": "Tue Dec 11 21:45:16 2012 -0800" }, "message": "fs: fuse: Workaround for CMA migration\n\nThe FUSE file system may hold references to pages for long\nperiods of time, preventing migration from occuring. If a CMA\npage is used here, CMA allocations may fail. Work around this\nby swapping out a CMA page for a non-CMA page when working with\nthe FUSE file system.\n\nChange-Id: Id763ea833ee125c8732ae3759ec9e20d94aa8424\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\nSigned-off-by: Mitchel Humpherys \u003cmitchelh@codeaurora.org\u003e\n" }, { "commit": "b002ccb6a793b396ab79848129b3949b3aaf5467", "tree": "bc0a542f65a39278eadef7358207f2051aa57294", "parents": [ "87eafac304670697e3c4389ddb7ad3f65965002d" ], "author": { "name": "Laura Abbott", "email": "lauraa@codeaurora.org", "time": "Thu Aug 30 18:01:17 2012 -0700" }, "committer": { "name": "Mitchel Humpherys", "email": "mitchelh@codeaurora.org", "time": "Tue Dec 11 21:45:08 2012 -0800" }, "message": "fs/buffer.c: Revoke LRU when trying to drop buffers\n\nWhen a buffer is added to the LRU list, a reference is taken which is\nnot dropped until the buffer is evicted from the LRU list. This is the\ncorrect behavior, however this LRU reference will prevent the buffer\nfrom being dropped. This means that the buffer can\u0027t actually be dropped\nuntil it is selected for eviction. There\u0027s no bound on the time spent\non the LRU list, which means that the buffer may be undroppable for\nvery long periods of time. Given that migration involves dropping\nbuffers, the associated page is now unmigratible for long periods of\ntime as well. CMA relies on being able to migrate a specific range\nof pages, so these these types of failures make CMA significantly\nless reliable, especially under high filesystem usage.\n\nRather than waiting for the LRU algorithm to eventually kick out\nthe buffer, explicitly remove the buffer from the LRU list when trying\nto drop it. There is still the possibility that the buffer\ncould be added back on the list, but that indicates the buffer is\nstill in use and would probably have other \u0027in use\u0027 indicates to\nprevent dropping.\n\nChange-Id: I253f4ee2069e190c1115afc421dadd27a7fa87dc\nSigned-off-by: Laura Abbott \u003clauraa@codeaurora.org\u003e\nSigned-off-by: Mitchel Humpherys \u003cmitchelh@codeaurora.org\u003e\n" }, { "commit": "88508f358367574f058180886644883e133615e8", "tree": "2aad5b8aa6576677af45567a8ce3f4c55f42c579", "parents": [ "82bf5d3ca80ecb4bc7b6c5ccfe64620eda7621c9" ], "author": { "name": "Devin Kim", "email": "dojip.kim@lge.com", "time": "Mon Oct 29 15:48:27 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Wed Nov 07 18:41:02 2012 -0800" }, "message": "nohz: Fix idle ticks in cpu summary line of /proc/stat\n\nGit commit 09a1d34f8535ecf9 \"nohz: Make idle/iowait counter update\nconditional\" introduced a bug in regard to cpu hotplug. The effect is\nthat the number of idle ticks in the cpu summary line in /proc/stat is\nstill counting ticks for offline cpus.\n\nReproduction is easy, just start a workload that keeps all cpus busy,\nswitch off one or more cpus and then watch the idle field in top.\nOn a dual-core with one cpu 100% busy and one offline cpu you will get\nsomething like this:\n\n%Cpu(s): 48.7 us, 1.3 sy, 0.0 ni, 50.0 id, 0.0 wa, 0.0 hi, 0.0 si,\n%0.0 st\n\nThe problem is that an offline cpu still has ts-\u003eidle_active \u003d\u003d 1.\nTo fix this we should make sure that the cpu is online when calling\nget_cpu_idle_time_us and get_cpu_iowait_time_us.\n\n[Srivatsa: Rebased to current mainline]\n\nChange-Id: I53cd02fef784647e45abb4c99ff641e5e69a9d3e\nReported-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20121010061820.8999.57245.stgit@srivatsabhat.in.ibm.com\nCc: deepthi@linux.vnet.ibm.com\nCc: stable@vger.kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "60236436491ce79327f9faf656a4392b1d92f4df", "tree": "1f72c8aada286427272bdef4ffa759f08ecbc601", "parents": [ "732f00aa455d86a6953ba401a6068af81d304a52", "fb92e57e92999dcd0f4620c1f02f07c2f9c8438f" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Aug 06 07:04:50 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Mon Aug 06 07:04:50 2012 -0700" }, "message": "Merge \"fs: yaffs2: Add null pointer check before dereferencing inode\" into msm-3.4" }, { "commit": "211a7caa61b22069ba78da124f864ceb65826c9e", "tree": "f7c5a43a7f912a20e4f86d5af810364d43dda076", "parents": [ "4181239136b9fb0b2c000fbff691f361dc9d48e5" ], "author": { "name": "Ajay Dudani", "email": "adudani@codeaurora.org", "time": "Tue Jul 24 20:50:09 2012 -0700" }, "committer": { "name": "Ajay Dudani", "email": "adudani@codeaurora.org", "time": "Thu Jul 26 09:23:11 2012 -0700" }, "message": "proc: show present cpu instead of online cpu in /proc/stat\n\nSome userspace applications use /proc/stat to determine how many CPUs\nthe system has. CPU hotplug can offline a CPU at runtime and causing the\noffline CPU not present in /proc/stat if we only show online cpu in\n/proc/stat.\n\nChange-Id: I4fd0cfcdb174244044634389da2fbdef77744c19\nSigned-off-by: Ajay Dudani \u003cadudani@codeaurora.org\u003e\n" }, { "commit": "fb92e57e92999dcd0f4620c1f02f07c2f9c8438f", "tree": "d56bb860113ebfaa8d49f58ad2e215b3bfbb12c4", "parents": [ "ef38094d89e5e0ccffff3edbea65d86661e7acb6" ], "author": { "name": "Sujit Reddy Thumma", "email": "sthumma@codeaurora.org", "time": "Fri Jun 29 13:50:22 2012 +0530" }, "committer": { "name": "Sujit Reddy Thumma", "email": "sthumma@codeaurora.org", "time": "Fri Jun 29 14:01:23 2012 +0530" }, "message": "fs: yaffs2: Add null pointer check before dereferencing inode\n\nIn yaffs_rename(), d_entry-\u003ed_inode can be NULL if the\ntarget directory doesn\u0027t exist or if there is any race\ncondition such as target directory being deleted while\nrenaming another directory to target directory name.\nAvoid dereferencing d_inode in such cases.\n\nCRs-Fixed: 360748\nChange-Id: If95b4992f1056fea78f2e1bd54253cd5c8aac93d\nSigned-off-by: Sujit Reddy Thumma \u003csthumma@codeaurora.org\u003e\n" }, { "commit": "1fe33450909be118727f0994531086bc0f187e0b", "tree": "0a2604472000a2a3d5c62c22459dcfa7e47c6c00", "parents": [ "e5547a0625584a8011a4f87100f4f28103640d36" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Thu Jun 14 13:03:06 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Thu Jun 14 13:03:06 2012 -0700" }, "message": "ubifs: Fix compiler warning\n\nThe compiler warns that \u0027saved_nlink\u0027 declared in line 980\nmay be used uninitialized.\n\nChange-Id: Ie725c0efe949213b1281a70c779a3167b1961327\nAcked-by: Kaushik Sikdar \u003cksikdar@qualcomm.com\u003e\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\u003e\n" }, { "commit": "f066380a08b607022e057034e9918bf73cb25785", "tree": "a569b92189c4f45c661c0deeacf15348b2d34b59", "parents": [ "fa002621c590c56e13cd86e944919a5771a6e03e", "46b442cc55bde917d677d8d8cfe89340311ae46c" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Thu Jun 07 11:14:52 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Thu Jun 07 11:14:52 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.130\u0027 into msm-3.4\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.130\u0027: (39 commits)\n msm: vidc: Add support for DIVX 4/5/6\n msm_fb: display: Set the minimal sleep time for DSI PHY Initialisation\n board: 8930: add debounce interval for gpio-keys\n regulator: Extend of_get_regulator_init_data to support non-DT consumers\n regulator: pm8xxx-regulator: Add slew_rate platform data parameter\n crypto: Fix initialization of array variable.\n arm: free all .init memory when CONFIG_STRICT_MEMORY_RWX is set\n msm: clock-copper: Remove block reset ability from most clocks\n msm: clock-local2: Fix local_vote_clk_reset to use right to_*_clk macro\n EHCI: HSIC: Add support for suspend, resume and URB logging\n arm/dt: msm-pm8941: Change boost regulator register address to 0xA000\n msm: camera: Move server code into seperate file.\n msm: camera: Close camera gracefully in case of userspace crash\n media: dvb: mpq: Support getting decoder\u0027s buffer status\n Bluetooth: Wait for wcnss to be ready after SSR\n msm: msm_sdcc: Add device tree support for SDCC controllers\n msm: display: Change DSI escape clock to byte clock\n msm: clock-8960: Change source of DSI escape clock to byte clock\n ASOC: msm: Enable mpq8064 machine driver.\n EHCI: HSIC: Set the interrupt threshold control value to 8ms\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\n" }, { "commit": "f132c6cf77251e011e1dad0ec88c0b1fda16d5aa", "tree": "f04b469a3547a19b7bdbe110adc571eb71c93328", "parents": [ "23016defd7db701a01dc49f972ad6b1bae9651c2", "3f6240f3e4e2608caf1a70d614ada658cbcbe7be" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:30:57 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:45:28 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027 into msm-3.4\n\nAU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.\nFirst parent is from google/android-3.4.\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027: (8712 commits)\n PRNG: Device tree entry for qrng device.\n vidc:1080p: Set video core timeout value for Thumbnail mode\n msm: sps: improve the debugging support in SPS driver\n board-8064 msm: Overlap secure and non secure video firmware heaps.\n msm: clock: Add handoff ops for 7x30 and copper XO clocks\n msm_fb: display: Wait for external vsync before DTV IOMMU unmap\n msm: Fix ciruclar dependency in debug UART settings\n msm: gdsc: Add GDSC regulator driver for msm-copper\n defconfig: Enable Mobicore Driver.\n mobicore: Add mobicore driver.\n mobicore: rename variable to lower case.\n mobicore: rename folder.\n mobicore: add makefiles\n mobicore: initial import of kernel driver\n ASoC: msm: Add SLIMBUS_2_RX CPU DAI\n board-8064-gpio: Update FUNC for EPM SPI CS\n msm_fb: display: Remove chicken bit config during video playback\n mmc: msm_sdcc: enable the sanitize capability\n msm-fb: display: lm2 writeback support on mpq platfroms\n msm_fb: display: Disable LVDS phy \u0026 pll during panel off\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\n" }, { "commit": "a872b71069d717ced1a2de642afa0693d1bb9448", "tree": "5ed460f78cd1f1ec335379ebf8ca183d3a0f7a5d", "parents": [ "9d413b9071e52bdbafa7253542999553aa4c0a4e" ], "author": { "name": "Subhash Jadavani", "email": "subhashj@codeaurora.org", "time": "Mon May 28 18:30:35 2012 +0530" }, "committer": { "name": "Subhash Jadavani", "email": "subhashj@codeaurora.org", "time": "Fri Jun 01 18:03:41 2012 +0530" }, "message": "fs: fat: rate limit the kernel messages\n\nIf FAT formatted SD card gets removed without unmounting,\nFAT file system may throw many kernel error messages which\ncould too much traffic for console driver and can sometimes\neven cause the system to trigger watchdog timeout.\n\nThis patch converts the printk to printk_ratelimited to rate\nlimit the error messages from FAT fs.\n\nChange-Id: I58b942f6714a8d3353478eb21139b8046ee3f875\nSigned-off-by: Subhash Jadavani \u003csubhashj@codeaurora.org\u003e\n" }, { "commit": "5500e4fab219bf210f22d2334cc98f3ca8f8912d", "tree": "60f3edf480190ee60676348c1ca2730a699f8671", "parents": [ "903f6c716db3d4e26952aae9717f81dd5bc9e4ba", "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "message": "Merge commit \u0027v3.4\u0027 into android-3.4\n" }, { "commit": "14e931a264498fbd4baef07ee0644e347252393b", "tree": "c202cd976f478fed3d7d786521ab3e32abdc0f9e", "parents": [ "a2ae9787568ac50978c03ce67bfb79ad2e100cca", "05c69d298c96703741cac9a5cbbf6c53bd55a6e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 19 10:12:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 19 10:12:17 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nPull block layer fixes from Jens Axboe:\n \"A few small, but important fixes. Most of them are marked for stable\n as well\n\n - Fix failure to release a semaphore on error path in mtip32xx.\n - Fix crashable condition in bio_get_nr_vecs().\n - Don\u0027t mark end-of-disk buffers as mapped, limit it to i_size.\n - Fix for build problem with CONFIG_BLOCK\u003dn on arm at least.\n - Fix for a buffer overlow on UUID partition printing.\n - Trivial removal of unused variables in dac960.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix buffer overflow when printing partition UUIDs\n Fix blkdev.h build errors when BLOCK\u003dn\n bio allocation failure due to bio_get_nr_vecs()\n block: don\u0027t mark buffers beyond end of disk as mapped\n mtip32xx: release the semaphore on an error path\n dac960: Remove unused variables from DAC960_CreateProcEntries()\n" }, { "commit": "73f1f5dd3ee3ec6e20768d831d9759b0330fad0e", "tree": "22f8498c47467f468dce6c3bca0eb1f3a0c9ade0", "parents": [ "30a08bf2d31d275c6fc71dd1811342777e95c831", "93c2d656c7120e29de8df5bc17bb2a97664104e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 18 15:56:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 18 15:56:25 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc fixes from Andrew Morton.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (4 patches)\n frv: delete incorrect task prototypes causing compile fail\n slub: missing test for partial pages flush work in flush_all()\n fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries\n drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01\n" }, { "commit": "30a08bf2d31d275c6fc71dd1811342777e95c831", "tree": "541e4d439b73accdaa48bf48fc77a1915555439b", "parents": [ "3d9944978e0bb6c98b901949cb7a22256e48b23d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 18 11:32:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 18 14:06:17 2012 -0700" }, "message": "proc: move fd symlink i_mode calculations into tid_fd_revalidate()\n\nInstead of doing the i_mode calculations at proc_fd_instantiate() time,\nmove them into tid_fd_revalidate(), which is where the other inode state\n(notably uid/gid information) is updated too.\n\nOtherwise we\u0027ll end up with stale i_mode information if an fd is re-used\nwhile the dentry still hangs around. Not that anything really *cares*\n(symlink permissions don\u0027t really matter), but Tetsuo Handa noticed that\nthe owner read/write bits don\u0027t always match the state of the\nreadability of the file descriptor, and we _used_ to get this right a\nlong time ago in a galaxy far, far away.\n\nBesides, aside from fixing an ugly detail (that has apparently been this\nway since commit 61a28784028e: \"proc: Remove the hard coded inode\nnumbers\" in 2006), this removes more lines of code than it adds. And it\njust makes sense to update i_mode in the same place we update i_uid/gid.\n\nAl Viro correctly points out that we could just do the inode fill in the\ninode iops -\u003egetattr() function instead. However, that does require\nsomewhat slightly more invasive changes, and adds yet *another* lookup\nof the file descriptor. We need to do the revalidate() for other\nreasons anyway, and have the file descriptor handy, so we might as well\nfill in the information at this point.\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@i-love.sakura.ne.jp\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nAcked-by: Eric Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb94cd96e05d6c65a07937e66a04ea265c1b767d", "tree": "0432ec8db57798b5212fa2200fe1293b01bd3361", "parents": [ "c0a5f4a05af588a0f9951f8d24e2564b09501918" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu May 17 17:03:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 17 18:00:51 2012 -0700" }, "message": "fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries\n\nmap_files/ entries are never supposed to be executed, still curious\nminds might try to run them, which leads to the following deadlock\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n [ INFO: possible circular locking dependency detected ]\n 3.4.0-rc4-24406-g841e6a6 #121 Not tainted\n -------------------------------------------------------\n bash/1556 is trying to acquire lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#8){+.+.+.}, at: do_lookup+0x267/0x2b1\n\n but task is already holding lock:\n (\u0026sig-\u003ecred_guard_mutex){+.+.+.}, at: prepare_bprm_creds+0x2d/0x69\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026sig-\u003ecred_guard_mutex){+.+.+.}:\n validate_chain+0x444/0x4f4\n __lock_acquire+0x387/0x3f8\n lock_acquire+0x12b/0x158\n __mutex_lock_common+0x56/0x3a9\n mutex_lock_killable_nested+0x40/0x45\n lock_trace+0x24/0x59\n proc_map_files_lookup+0x5a/0x165\n __lookup_hash+0x52/0x73\n do_lookup+0x276/0x2b1\n walk_component+0x3d/0x114\n do_last+0xfc/0x540\n path_openat+0xd3/0x306\n do_filp_open+0x3d/0x89\n do_sys_open+0x74/0x106\n sys_open+0x21/0x23\n tracesys+0xdd/0xe2\n\n -\u003e #0 (\u0026sb-\u003es_type-\u003ei_mutex_key#8){+.+.+.}:\n check_prev_add+0x6a/0x1ef\n validate_chain+0x444/0x4f4\n __lock_acquire+0x387/0x3f8\n lock_acquire+0x12b/0x158\n __mutex_lock_common+0x56/0x3a9\n mutex_lock_nested+0x40/0x45\n do_lookup+0x267/0x2b1\n walk_component+0x3d/0x114\n link_path_walk+0x1f9/0x48f\n path_openat+0xb6/0x306\n do_filp_open+0x3d/0x89\n open_exec+0x25/0xa0\n do_execve_common+0xea/0x2f9\n do_execve+0x43/0x45\n sys_execve+0x43/0x5a\n stub_execve+0x6c/0xc0\n\nThis is because prepare_bprm_creds grabs task-\u003esignal-\u003ecred_guard_mutex\nand when do_lookup happens we try to grab task-\u003esignal-\u003ecred_guard_mutex\nagain in lock_trace.\n\nFix it using plain ptrace_may_access() helper in proc_map_files_lookup()\nand in proc_map_files_readdir() instead of lock_trace(), the caller must\nbe CAP_SYS_ADMIN granted anyway.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.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": "dfae359f083fac3a884e10b46ebe0f262a9bd97a", "tree": "25a547a4cb2b1cdac99766c62442c1f73bc50582", "parents": [ "39d6411b7df566715138c8c9f7fa00227f4ae75b", "531c8ff0d472295f5ef5d1bd306115c81a84889e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 16 14:22:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 16 14:22:38 2012 -0700" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\nPull CIFS fix from Jeff Layton\n\n* git://git.samba.org/sfrench/cifs-2.6:\n cifs: fix misspelling of \"forcedirectio\"\n" }, { "commit": "531c8ff0d472295f5ef5d1bd306115c81a84889e", "tree": "1b7c638d73d60bba5c27094566e5d07e3e6b249b", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Wed May 16 07:12:26 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed May 16 11:26:25 2012 -0500" }, "message": "cifs: fix misspelling of \"forcedirectio\"\n\n...and add a \"directio\" synonym since that\u0027s what the manpage has\nalways advertised.\n\nAcked-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "ec0b571c19ac62ab0bb80d373a3d4922a48b4b75", "tree": "10c597f5227c969c3f2b909fbeb29725a0c5c6e8", "parents": [ "7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc", "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc7\u0027 into android-3.4\n" }, { "commit": "9ff00d58a915b6747ba2e843ab2d04c712b4dc32", "tree": "3c4bed740dae7b6115b89387d766962d6dad7cd6", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664", "b027274d2e3a332683b73f15e5cea79c240bc9a3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 13 11:33:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 13 11:33:09 2012 -0700" }, "message": "Merge tag \u0027for-linus-3.4-20120513\u0027 of git://git.infradead.org/linux-mtd\n\nPull three MTD fixes from David Woodhouse:\n - Fix a lock ordering deadlock in JFFS2\n - Fix an oops in the dataflash driver, triggered by a dummy call to test\n whether it has OTP functionality.\n - Fix request_mem_region() failure on amsdelta NAND driver.\n\n* tag \u0027for-linus-3.4-20120513\u0027 of git://git.infradead.org/linux-mtd:\n mtd: ams-delta: fix request_mem_region() failure\n jffs2: Fix lock acquisition order bug in gc path\n mtd: fix oops in dataflash driver\n" }, { "commit": "f908ee9463b09ddd05e1c1a0111132212dc05fac", "tree": "af80b227ec2049aa23fc3a8867e70fd685a4d34a", "parents": [ "080399aaaf3531f5b8761ec0ac30ff98891e8686" ], "author": { "name": "Bernd Schubert", "email": "bernd.schubert@itwm.fraunhofer.de", "time": "Fri May 11 16:36:44 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri May 11 16:45:12 2012 +0200" }, "message": "bio allocation failure due to bio_get_nr_vecs()\n\nThe number of bio_get_nr_vecs() is passed down via bio_alloc() to\nbvec_alloc_bs(), which fails the bio allocation if\nnr_iovecs \u003e BIO_MAX_PAGES. For the underlying caller this causes an\nunexpected bio allocation failure.\nLimiting to queue_max_segments() is not sufficient, as max_segments\nalso might be very large.\n\nbvec_alloc_bs(gfp_mask, nr_iovecs, ) \u003d\u003e NULL when nr_iovecs \u003e BIO_MAX_PAGES\nbio_alloc_bioset(gfp_mask, nr_iovecs, ...)\nbio_alloc(GFP_NOIO, nvecs)\nxfs_alloc_ioend_bio()\n\nSigned-off-by: Bernd Schubert \u003cbernd.schubert@itwm.fraunhofer.de\u003e\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "080399aaaf3531f5b8761ec0ac30ff98891e8686", "tree": "28ba8f41bb67a58992bc426dac7002983bc64e8f", "parents": [ "a09ba13eefb155a00d8d50008a0c0a2406985ddd" ], "author": { "name": "Jeff Moyer", "email": "jmoyer@redhat.com", "time": "Fri May 11 16:34:10 2012 +0200" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri May 11 16:42:14 2012 +0200" }, "message": "block: don\u0027t mark buffers beyond end of disk as mapped\n\nHi,\n\nWe have a bug report open where a squashfs image mounted on ppc64 would\nexhibit errors due to trying to read beyond the end of the disk. It can\neasily be reproduced by doing the following:\n\n[root@ibm-p750e-02-lp3 ~]# ls -l install.img\n-rw-r--r-- 1 root root 142032896 Apr 30 16:46 install.img\n[root@ibm-p750e-02-lp3 ~]# mount -o loop ./install.img /mnt/test\n[root@ibm-p750e-02-lp3 ~]# dd if\u003d/dev/loop0 of\u003d/dev/null\ndd: reading `/dev/loop0\u0027: Input/output error\n277376+0 records in\n277376+0 records out\n142016512 bytes (142 MB) copied, 0.9465 s, 150 MB/s\n\nIn dmesg, you\u0027ll find the following:\n\nsquashfs: version 4.0 (2009/01/31) Phillip Lougher\n[ 43.106012] attempt to access beyond end of device\n[ 43.106029] loop0: rw\u003d0, want\u003d277410, limit\u003d277408\n[ 43.106039] Buffer I/O error on device loop0, logical block 138704\n[ 43.106053] attempt to access beyond end of device\n[ 43.106057] loop0: rw\u003d0, want\u003d277412, limit\u003d277408\n[ 43.106061] Buffer I/O error on device loop0, logical block 138705\n[ 43.106066] attempt to access beyond end of device\n[ 43.106070] loop0: rw\u003d0, want\u003d277414, limit\u003d277408\n[ 43.106073] Buffer I/O error on device loop0, logical block 138706\n[ 43.106078] attempt to access beyond end of device\n[ 43.106081] loop0: rw\u003d0, want\u003d277416, limit\u003d277408\n[ 43.106085] Buffer I/O error on device loop0, logical block 138707\n[ 43.106089] attempt to access beyond end of device\n[ 43.106093] loop0: rw\u003d0, want\u003d277418, limit\u003d277408\n[ 43.106096] Buffer I/O error on device loop0, logical block 138708\n[ 43.106101] attempt to access beyond end of device\n[ 43.106104] loop0: rw\u003d0, want\u003d277420, limit\u003d277408\n[ 43.106108] Buffer I/O error on device loop0, logical block 138709\n[ 43.106112] attempt to access beyond end of device\n[ 43.106116] loop0: rw\u003d0, want\u003d277422, limit\u003d277408\n[ 43.106120] Buffer I/O error on device loop0, logical block 138710\n[ 43.106124] attempt to access beyond end of device\n[ 43.106128] loop0: rw\u003d0, want\u003d277424, limit\u003d277408\n[ 43.106131] Buffer I/O error on device loop0, logical block 138711\n[ 43.106135] attempt to access beyond end of device\n[ 43.106139] loop0: rw\u003d0, want\u003d277426, limit\u003d277408\n[ 43.106143] Buffer I/O error on device loop0, logical block 138712\n[ 43.106147] attempt to access beyond end of device\n[ 43.106151] loop0: rw\u003d0, want\u003d277428, limit\u003d277408\n[ 43.106154] Buffer I/O error on device loop0, logical block 138713\n[ 43.106158] attempt to access beyond end of device\n[ 43.106162] loop0: rw\u003d0, want\u003d277430, limit\u003d277408\n[ 43.106166] attempt to access beyond end of device\n[ 43.106169] loop0: rw\u003d0, want\u003d277432, limit\u003d277408\n...\n[ 43.106307] attempt to access beyond end of device\n[ 43.106311] loop0: rw\u003d0, want\u003d277470, limit\u003d2774\n\nSquashfs manages to read in the end block(s) of the disk during the\nmount operation. Then, when dd reads the block device, it leads to\nblock_read_full_page being called with buffers that are beyond end of\ndisk, but are marked as mapped. Thus, it would end up submitting read\nI/O against them, resulting in the errors mentioned above. I fixed the\nproblem by modifying init_page_buffers to only set the buffer mapped if\nit fell inside of i_size.\n\nCheers,\nJeff\n\nSigned-off-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nAcked-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n\n--\n\nChanges from v1-\u003ev2: re-used max_block, as suggested by Nick Piggin.\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "7c283324da366a3e6ffaad4352a51a3c71fcae17", "tree": "b4d02c340a17ac5134889c4eec7dcd06d407e3ca", "parents": [ "9e5869f8d70d94850cf86163c57ba8d4daa29924", "17ff3c1fa4c7bd0c38d751715033023ebf32fc96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 15:17:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 15:17:24 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc fixes from Andrew Morton.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (8 patches)\n MAINTAINERS: add maintainer for LED subsystem\n mm: nobootmem: fix sign extend problem in __free_pages_memory()\n drivers/leds: correct __devexit annotations\n memcg: free spare array to avoid memory leak\n namespaces, pid_ns: fix leakage on fork() failure\n hugetlb: prevent BUG_ON in hugetlb_fault() -\u003e hugetlb_cow()\n mm: fix division by 0 in percpu_pagelist_fraction()\n proc/pid/pagemap: correctly report non-present ptes and holes between vmas\n" }, { "commit": "16fbdce62d9c89b794e303f4a232e4749b77e9ac", "tree": "b0088af87f70ceeef0fbe55bc2200b4f1b9aa816", "parents": [ "bc46f9375a286d05f84a9464efc2b7f1f5614ff4" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu May 10 13:01:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 15:06:44 2012 -0700" }, "message": "proc/pid/pagemap: correctly report non-present ptes and holes between vmas\n\nReset the current pagemap-entry if the current pte isn\u0027t present, or if\ncurrent vma is over. Otherwise pagemap reports last entry again and\nagain.\n\nNon-present pte reporting was broken in commit 092b50bacd1c (\"pagemap:\nintroduce data structure for pagemap entry\")\n\nReporting for holes was broken in commit 5aaabe831eb5 (\"pagemap: avoid\nsplitting thp when reading /proc/pid/pagemap\")\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nReported-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "48a5730e5b71201e226ff06e245bf308feba5f10", "tree": "2018cd2924ed13f736032beec587858c5e688ce1", "parents": [ "7ee94d97aafacf5a019b3578e0eae6daa2e2bcd5" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Mon Apr 30 17:36:21 2012 +0300" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed May 09 15:16:22 2012 -0500" }, "message": "cifs: fix revalidation test in cifs_llseek()\n\nThis test is always true so it means we revalidate the length every\ntime, which generates more network traffic. When it is SEEK_SET or\nSEEK_CUR, then we don\u0027t need to revalidate.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "f02fac63308349b1dbde468adfd084fdb560eeae", "tree": "35c39e5c3c70e40c52bc18c07a88dd7a1becb649", "parents": [ "6ff6845be02be8d53da28d2333a015d54b1234db", "d48b97b403d23f6df0b990cee652bdf9a52337a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc6\u0027 into android-3.4\n\nConflicts:\n\tarch/arm/mm/cache-l2x0.c\n\tarch/arm/mm/mmu.c\n\nChange-Id: If4f371a21c052fa597d107c44b128a093e4a8b91\n" }, { "commit": "226bb7df3d22bcf4a1c0fe8206c80cc427498eae", "tree": "9e876ce5c9a8699ecacccf9dc3ee4a9c436015c3", "parents": [ "7a84477c4acebf6299b6a8bd6a1d5894eb838ffa" ], "author": { "name": "Josh Cartwright", "email": "joshc@linux.com", "time": "Thu Mar 29 19:34:53 2012 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Mon May 07 20:30:14 2012 +0100" }, "message": "jffs2: Fix lock acquisition order bug in gc path\n\nThe locking policy is such that the erase_complete_block spinlock is\nnested within the alloc_sem mutex. This fixes a case in which the\nacquisition order was erroneously reversed. This issue was caught by\nthe following lockdep splat:\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n [ INFO: possible circular locking dependency detected ]\n 3.0.5 #1\n -------------------------------------------------------\n jffs2_gcd_mtd6/299 is trying to acquire lock:\n (\u0026c-\u003ealloc_sem){+.+.+.}, at: [\u003cc01f7714\u003e] jffs2_garbage_collect_pass+0x314/0x890\n\n but task is already holding lock:\n (\u0026(\u0026c-\u003eerase_completion_lock)-\u003erlock){+.+...}, at: [\u003cc01f7708\u003e] jffs2_garbage_collect_pass+0x308/0x890\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026(\u0026c-\u003eerase_completion_lock)-\u003erlock){+.+...}:\n [\u003cc008bec4\u003e] validate_chain+0xe6c/0x10bc\n [\u003cc008c660\u003e] __lock_acquire+0x54c/0xba4\n [\u003cc008d240\u003e] lock_acquire+0xa4/0x114\n [\u003cc046780c\u003e] _raw_spin_lock+0x3c/0x4c\n [\u003cc01f744c\u003e] jffs2_garbage_collect_pass+0x4c/0x890\n [\u003cc01f937c\u003e] jffs2_garbage_collect_thread+0x1b4/0x1cc\n [\u003cc0071a68\u003e] kthread+0x98/0xa0\n [\u003cc000f264\u003e] kernel_thread_exit+0x0/0x8\n\n -\u003e #0 (\u0026c-\u003ealloc_sem){+.+.+.}:\n [\u003cc008ad2c\u003e] print_circular_bug+0x70/0x2c4\n [\u003cc008c08c\u003e] validate_chain+0x1034/0x10bc\n [\u003cc008c660\u003e] __lock_acquire+0x54c/0xba4\n [\u003cc008d240\u003e] lock_acquire+0xa4/0x114\n [\u003cc0466628\u003e] mutex_lock_nested+0x74/0x33c\n [\u003cc01f7714\u003e] jffs2_garbage_collect_pass+0x314/0x890\n [\u003cc01f937c\u003e] jffs2_garbage_collect_thread+0x1b4/0x1cc\n [\u003cc0071a68\u003e] kthread+0x98/0xa0\n [\u003cc000f264\u003e] kernel_thread_exit+0x0/0x8\n\n other info that might help us debug this:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(\u0026(\u0026c-\u003eerase_completion_lock)-\u003erlock);\n lock(\u0026c-\u003ealloc_sem);\n lock(\u0026(\u0026c-\u003eerase_completion_lock)-\u003erlock);\n lock(\u0026c-\u003ealloc_sem);\n\n *** DEADLOCK ***\n\n 1 lock held by jffs2_gcd_mtd6/299:\n #0: (\u0026(\u0026c-\u003eerase_completion_lock)-\u003erlock){+.+...}, at: [\u003cc01f7708\u003e] jffs2_garbage_collect_pass+0x308/0x890\n\n stack backtrace:\n [\u003cc00155dc\u003e] (unwind_backtrace+0x0/0x100) from [\u003cc0463dc0\u003e] (dump_stack+0x20/0x24)\n [\u003cc0463dc0\u003e] (dump_stack+0x20/0x24) from [\u003cc008ae84\u003e] (print_circular_bug+0x1c8/0x2c4)\n [\u003cc008ae84\u003e] (print_circular_bug+0x1c8/0x2c4) from [\u003cc008c08c\u003e] (validate_chain+0x1034/0x10bc)\n [\u003cc008c08c\u003e] (validate_chain+0x1034/0x10bc) from [\u003cc008c660\u003e] (__lock_acquire+0x54c/0xba4)\n [\u003cc008c660\u003e] (__lock_acquire+0x54c/0xba4) from [\u003cc008d240\u003e] (lock_acquire+0xa4/0x114)\n [\u003cc008d240\u003e] (lock_acquire+0xa4/0x114) from [\u003cc0466628\u003e] (mutex_lock_nested+0x74/0x33c)\n [\u003cc0466628\u003e] (mutex_lock_nested+0x74/0x33c) from [\u003cc01f7714\u003e] (jffs2_garbage_collect_pass+0x314/0x890)\n [\u003cc01f7714\u003e] (jffs2_garbage_collect_pass+0x314/0x890) from [\u003cc01f937c\u003e] (jffs2_garbage_collect_thread+0x1b4/0x1cc)\n [\u003cc01f937c\u003e] (jffs2_garbage_collect_thread+0x1b4/0x1cc) from [\u003cc0071a68\u003e] (kthread+0x98/0xa0)\n [\u003cc0071a68\u003e] (kthread+0x98/0xa0) from [\u003cc000f264\u003e] (kernel_thread_exit+0x0/0x8)\n\nThis was introduce in \u002781cfc9f jffs2: Fix serious write stall due to erase\u0027.\n\nCc: stable@kernel.org [2.6.37+]\nSigned-off-by: Josh Cartwright \u003cjoshc@linux.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cartem.bityutskiy@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "271fd5d7286eb931142402c170943d14640bb922", "tree": "dc60c1623f63a7db588de4c3c7362a9ac7abf56a", "parents": [ "ce7e5d2d19bc371e1b67826bfbc79bbcbaa9772f", "b9fab919b748c7b39c19ff236ed6c5682c266dde" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 06 10:20:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 06 10:20:07 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs fixes from Chris Mason:\n \"The big ones here are a memory leak we introduced in rc1, and a\n scheduling while atomic if the transid on disk doesn\u0027t match the\n transid we expected. This happens for corrupt blocks, or out of date\n disks.\n\n It also fixes up the ioctl definition for our ioctl to resolve logical\n inode numbers. The __u32 was a merging error and doesn\u0027t match what\n we ship in the progs.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: avoid sleeping in verify_parent_transid while atomic\n Btrfs: fix crash in scrub repair code when device is missing\n btrfs: Fix mismatching struct members in ioctl.h\n Btrfs: fix page leak when allocing extent buffers\n Btrfs: Add properly locking around add_root_to_dirty_list\n" }, { "commit": "b9fab919b748c7b39c19ff236ed6c5682c266dde", "tree": "49e5a6f8041a7f0a9be0c1a39cd9088e3faa1df2", "parents": [ "ea9947b4395fa34666086b2fa6f686e94903e047" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun May 06 07:23:47 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun May 06 07:23:47 2012 -0400" }, "message": "Btrfs: avoid sleeping in verify_parent_transid while atomic\n\nverify_parent_transid needs to lock the extent range to make\nsure no IO is underway, and so it can safely clear the\nuptodate bits if our checks fail.\n\nBut, a few callers are using it with spinlocks held. Most\nof the time, the generation numbers are going to match, and\nwe don\u0027t want to switch to a blocking lock just for the error\ncase. This adds an atomic flag to verify_parent_transid,\nand changes it to return EAGAIN if it needs to block to\nproperly verifiy things.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6f24f892871acc47b40dd594c63606a17c714f77", "tree": "b01432358955a328da347e7f05c096d2ca4366ce", "parents": [ "f756beba940ca21755396851521463d494893566" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri May 04 12:09:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 04 17:11:24 2012 -0700" }, "message": "hfsplus: Fix potential buffer overflows\n\nCommit ec81aecb2966 (\"hfs: fix a potential buffer overflow\") fixed a few\npotential buffer overflows in the hfs filesystem. But as Timo Warns\npointed out, these changes also need to be made on the hfsplus\nfilesystem as well.\n\nReported-by: Timo Warns \u003cwarns@pre-sense.de\u003e\nAcked-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Alexey Khoroshilov \u003ckhoroshilov@ispras.ru\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nCc: Sage Weil \u003csage@newdream.net\u003e\nCc: Eugene Teo \u003ceteo@redhat.com\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Dave Anderson \u003canderson@redhat.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6de1687f57893df31fd5266ead3479418230a06", "tree": "70aee3407e518f55377da4ec105bf13f491b47e8", "parents": [ "a03a09b2245b4aa255760796e0c0d05b5d79b2a8", "d8f2799b105a24bb0bbd3380a0d56e6348484058" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 04 15:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 04 15:34:21 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 fs/cifs: fix parsing of dfs referrals\n cifs: make sure we ignore the credentials\u003d and cred\u003d options\n [CIFS] Update cifs version to 1.78\n cifs - check S_AUTOMOUNT in revalidate\n cifs: add missing initialization of server-\u003ereq_lock\n cifs: don\u0027t cap ra_pages at the same level as default_backing_dev_info\n CIFS: Fix indentation in cifs_show_options\n" }, { "commit": "ea9947b4395fa34666086b2fa6f686e94903e047", "tree": "086ab5150fc7f37b2070ab1200bf8b5275c85f06", "parents": [ "d04b1debc92535453df2494d0b019edf0bb91003" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Fri May 04 15:16:07 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri May 04 15:16:07 2012 -0400" }, "message": "Btrfs: fix crash in scrub repair code when device is missing\n\nFix that when scrub tries to repair an I/O or checksum error and one of\nthe devices containing the mirror is missing, it crashes in bio_add_page\nbecause the bdev is a NULL pointer for missing devices.\n\nReported-by: Marco L. Crociani \u003cmarco.crociani@gmail.com\u003e\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d04b1debc92535453df2494d0b019edf0bb91003", "tree": "386e5ce40a3d4c211bafc20da9480eb6783f6ab4", "parents": [ "17de39ac17bf99b8bf0d819d13668d5048836efc" ], "author": { "name": "Alexander Block", "email": "ablock84@googlemail.com", "time": "Fri May 04 15:16:06 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri May 04 15:16:06 2012 -0400" }, "message": "btrfs: Fix mismatching struct members in ioctl.h\n\nFix the size members of btrfs_ioctl_ino_path_args and\nbtrfs_ioctl_logical_ino_args. The user space btrfs-progs utilities used\n__u64 and the kernel headers used __u32 before.\n\nSigned-off-by: Alexander Block \u003cablock84@googlemail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "17de39ac17bf99b8bf0d819d13668d5048836efc", "tree": "6afd6d7659ad9d4d46aecc24e359c026bae7c7f7", "parents": [ "e5846fc665d1c3dd32d877febe7402ccd583b8a1" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri May 04 15:16:06 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri May 04 15:16:06 2012 -0400" }, "message": "Btrfs: fix page leak when allocing extent buffers\n\nIf we happen to alloc a extent buffer and then alloc a page and notice that\npage is already attached to an extent buffer, we will only unlock it and\nfree our existing eb. Any pages currently attached to that eb will be\nproperly freed, but we don\u0027t do the page_cache_release() on the page where\nwe noticed the other extent buffer which can cause us to leak pages and I\nhope cause the weird issues we\u0027ve been seeing in this area. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e5846fc665d1c3dd32d877febe7402ccd583b8a1", "tree": "162d4487dd5cb573036507821d92d5c0c559d56b", "parents": [ "dc7fdde39e4962b1a88741f7eba2a6b3be1285d8" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu May 03 12:08:48 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri May 04 15:14:11 2012 -0400" }, "message": "Btrfs: Add properly locking around add_root_to_dirty_list\n\nadd_root_to_dirty_list happens once at the very beginning of the\ntransaction, but it is still racey.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d8f2799b105a24bb0bbd3380a0d56e6348484058", "tree": "170d00ed1bb01443fb1b1695f9fcea3adb3d1f10", "parents": [ "a557b97616c49d81e09c8439831d4c4f13ef4050" ], "author": { "name": "Stefan Metzmacher", "email": "metze@samba.org", "time": "Fri May 04 00:19:28 2012 +0200" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Thu May 03 22:47:39 2012 -0500" }, "message": "fs/cifs: fix parsing of dfs referrals\n\nThe problem was that the first referral was parsed more than once\nand so the caller tried the same referrals multiple times.\n\nThe problem was introduced partly by commit\n066ce6899484d9026acd6ba3a8dbbedb33d7ae1b,\nwhere \u0027ref +\u003d le16_to_cpu(ref-\u003eSize);\u0027 got lost,\nbut that was also wrong...\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Stefan Metzmacher \u003cmetze@samba.org\u003e\nTested-by: Björn Jacke \u003cbj@sernet.de\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "e419b4cc585680940bc42f8ca8a071d6023fb1bb", "tree": "8fce0f12b7b2a0fdca7a937af137910011efa783", "parents": [ "ac001e76546523ec2ef05b2f7001d8fdc588d069" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 10:16:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 14:01:40 2012 -0700" }, "message": "vfs: make word-at-a-time accesses handle a non-existing page\n\nIt turns out that there are more cases than CONFIG_DEBUG_PAGEALLOC that\ncan have holes in the kernel address space: it seems to happen easily\nwith Xen, and it looks like the AMD gart64 code will also punch holes\ndynamically.\n\nActually hitting that case is still very unlikely, so just do the\naccess, and take an exception and fix it up for the very unlikely case\nof it being a page-crosser with no next page.\n\nAnd hey, this abstraction might even help other architectures that have\nother issues with unaligned word accesses than the possible missing next\npage. IOW, this could do the byte order magic too.\n\nPeter Anvin fixed a thinko in the shifting for the exception case.\n\nReported-and-tested-by: Jana Saout \u003cjana@saout.de\u003e\nCc: Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a557b97616c49d81e09c8439831d4c4f13ef4050", "tree": "11824355379fb4272353c4e7e240acd6fabbba02", "parents": [ "f966424e9935900e34cace8116d37aa70cff23d0" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Wed May 02 14:02:40 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Thu May 03 13:50:01 2012 -0500" }, "message": "cifs: make sure we ignore the credentials\u003d and cred\u003d options\n\nOlder mount.cifs programs passed this on to the kernel after parsing\nthe file. Make sure the kernel ignores that option.\n\nShould fix:\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d43195\n\nCc: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nReported-by: Ronald \u003cronald645@gmail.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "f966424e9935900e34cace8116d37aa70cff23d0", "tree": "3e02c49ef9b23ff7370d808b2226ad772a1acaa8", "parents": [ "936ad9094462578953042d3395b973f1c9e6fa95" ], "author": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Wed May 02 11:58:19 2012 -0500" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Thu May 03 13:50:01 2012 -0500" }, "message": "[CIFS] Update cifs version to 1.78\n\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "936ad9094462578953042d3395b973f1c9e6fa95", "tree": "22d52c9a2489768a9d70d95ef1a99c78185698c3", "parents": [ "58fa015f611b51e1f501b048bc5ac263c78852f0" ], "author": { "name": "Ian Kent", "email": "raven@themaw.net", "time": "Wed May 02 07:19:09 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Thu May 03 13:49:47 2012 -0500" }, "message": "cifs - check S_AUTOMOUNT in revalidate\n\nWhen revalidating a dentry, if the inode wasn\u0027t known to be a dfs\nentry when the dentry was instantiated, such as when created via\n-\u003ereaddir(), the DCACHE_NEED_AUTOMOUNT flag needs to be set on the\ndentry in -\u003ed_revalidate().\n\nThe false return from cifs_d_revalidate(), due to the inode now\nbeing marked with the S_AUTOMOUNT flag, might not invalidate the\ndentry if there is a concurrent unlazy path walk. This is because\nthe dentry reference count will be at least 2 in this case causing\nd_invalidate() to return EBUSY. So the asumption that the dentry\nwill be discarded then correctly instantiated via -\u003elookup() might\nnot hold.\n\nSigned-off-by: Ian Kent \u003craven@themaw.net\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nCc: Steve French \u003csmfrench@gmail.com\u003e\nCc: linux-cifs@vger.kernel.org\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "529acf58981440eefeaf1451387e2a0aa4825c12", "tree": "ffcf408493a34ab1e0e1530dca83aa279708560c", "parents": [ "b821861b905a79f71746945237968c3382d99adc", "3617e5031b3acec04efaa36566a8111ac8f07325" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 02 08:17:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 02 08:17:57 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fixes for the NFSv4 security negotiation\n - Use the correct hostname when mounting from a private namespace\n - NFS net namespace bugfixes for the pipefs filesystem\n - NFSv4 GETACL bugfixes\n - IPv6 bugfix for NFSv4 referrals\n\n* tag \u0027nfs-for-3.4-4\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4.1: Use the correct hostname in the client identifier string\n SUNRPC: RPC client must use the current utsname hostname string\n NFS: get module in idmap PipeFS notifier callback\n NFS: Remove unused function nfs_lookup_with_sec()\n NFS: Honor the authflavor set in the clone mount data\n NFS: Fix following referral mount points with different security\n NFS: Do secinfo as part of lookup\n NFS: Handle exceptions coming out of nfs4_proc_fs_locations()\n NFS: Fix SECINFO_NO_NAME\n SUNRPC: traverse clients tree on PipeFS event\n SUNRPC: set per-net PipeFS superblock before notification\n SUNRPC: skip clients with program without PipeFS entries\n SUNRPC: skip dead but not buried clients on PipeFS events\n Avoid beyond bounds copy while caching ACL\n Avoid reading past buffer when calling GETACL\n fix page number calculation bug for block layout decode buffer\n NFSv4.1 fix page number calculation bug for filelayout decode buffers\n pnfs-obj: Remove unused variable from objlayout_get_deviceinfo()\n nfs4: fix referrals on mounts that use IPv6 addrs\n" }, { "commit": "58fa015f611b51e1f501b048bc5ac263c78852f0", "tree": "b4a8723d1ddb9e943c5954dd65fe9e3e3c1089e5", "parents": [ "8f71465c19ffefbfd0da3c1f5dc172b4bce05e93" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Tue May 01 17:41:16 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Tue May 01 22:29:51 2012 -0500" }, "message": "cifs: add missing initialization of server-\u003ereq_lock\n\nCc: Pavel Shilovsky \u003cpiastryyy@gmail.com\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "8f71465c19ffefbfd0da3c1f5dc172b4bce05e93", "tree": "c27bb25b91b148e5977ea29132dc98ccea89f725", "parents": [ "156d17905e783d057061b3b56a9b3befec064e47" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Tue May 01 17:41:49 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Tue May 01 22:27:54 2012 -0500" }, "message": "cifs: don\u0027t cap ra_pages at the same level as default_backing_dev_info\n\nWhile testing, I\u0027ve found that even when we are able to negotiate a\nmuch larger rsize with the server, on-the-wire reads often end up being\ncapped at 128k because of ra_pages being capped at that level.\n\nLifting this restriction gave almost a twofold increase in sequential\nread performance on my craptactular KVM test rig with a 1M rsize.\n\nI think this is safe since the actual ra_pages that the VM requests\nis run through max_sane_readahead() prior to submitting the I/O. Under\nmemory pressure we should end up with large readahead requests being\nsuppressed anyway.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "156d17905e783d057061b3b56a9b3befec064e47", "tree": "83df60eb473d8b502e6f496cffdc67bc9ad2c55a", "parents": [ "b821861b905a79f71746945237968c3382d99adc" ], "author": { "name": "Sachin Prabhu", "email": "sprabhu@redhat.com", "time": "Wed Apr 25 12:10:14 2012 +0100" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Tue May 01 22:19:43 2012 -0500" }, "message": "CIFS: Fix indentation in cifs_show_options\n\nTrivial patch which fixes a misplaced tab in cifs_show_options().\n\nSigned-off-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "aadf030d84352a91cdadf50f947da739c5611450", "tree": "5f22ec57ee257776b4c157f0c91f3612f05ed6c5", "parents": [ "aad2732ba0dddcf3446a4e3c4843496759c1c305", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc5\u0027 into android-3.4\n" }, { "commit": "8a7dc4b04b22be285ea5bef7d01a02f91e30d562", "tree": "20a8c483fbbee01c7b972dd4bd45b6753fa2d92f", "parents": [ "fbf717629ff03f110f177d244933276423f99a27" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Mon Apr 30 12:25:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 30 12:28:48 2012 -0700" }, "message": "nfsd: fix nfs4recover.c printk format warning\n\nFix printk format warnings -- both items are size_t,\nso use %zu to print them.\n\nfs/nfsd/nfs4recover.c:580:3: warning: format \u0027%lu\u0027 expects type \u0027long unsigned int\u0027, but argument 3 has type \u0027size_t\u0027\nfs/nfsd/nfs4recover.c:580:3: warning: format \u0027%lu\u0027 expects type \u0027long unsigned int\u0027, but argument 4 has type \u0027unsigned int\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: linux-nfs@vger.kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3617e5031b3acec04efaa36566a8111ac8f07325", "tree": "20fac2901263ee8602e2c211dd971705c58974f5", "parents": [ "cbbb34498f8b2b26cbdc79532c8a2ee5cd1e756a" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 12:04:58 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 12:04:58 2012 -0400" }, "message": "NFSv4.1: Use the correct hostname in the client identifier string\n\nWe need to use the hostname of the process that created the nfs_client.\nThat hostname is now stored in the rpc_client-\u003ecl_nodename.\n\nAlso remove the utsname()-\u003edomainname component. There is no reason\nto include the NIS/YP domainname in a client identifier string.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "64f371bc3107e69efce563a3d0f0e6880de0d537", "tree": "7eac8ef3bf7a6cc8f9e147b9bf341b14fc6ae7f3", "parents": [ "9883035ae7edef3ec62ad215611cb8e17d6a1a5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:30:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:30:08 2012 -0700" }, "message": "autofs: make the autofsv5 packet file descriptor use a packetized pipe\n\nThe autofs packet size has had a very unfortunate size problem on x86:\nbecause the alignment of \u0027u64\u0027 differs in 32-bit and 64-bit modes, and\nbecause the packet data was not 8-byte aligned, the size of the autofsv5\npacket structure differed between 32-bit and 64-bit modes despite\nlooking otherwise identical (300 vs 304 bytes respectively).\n\nWe first fixed that up by making the 64-bit compat mode know about this\nproblem in commit a32744d4abae (\"autofs: work around unhappy compat\nproblem on x86-64\"), and that made a 32-bit \u0027systemd\u0027 work happily on a\n64-bit kernel because everything then worked the same way as on a 32-bit\nkernel.\n\nBut it turned out that \u0027automount\u0027 had actually known and worked around\nthis problem in user space, so fixing the kernel to do the proper 32-bit\ncompatibility handling actually *broke* 32-bit automount on a 64-bit\nkernel, because it knew that the packet sizes were wrong and expected\nthose incorrect sizes.\n\nAs a result, we ended up reverting that compatibility mode fix, and\nthus breaking systemd again, in commit fcbf94b9dedd.\n\nWith both automount and systemd doing a single read() system call, and\nverifying that they get *exactly* the size they expect but using\ndifferent sizes, it seemed that fixing one of them inevitably seemed to\nbreak the other. At one point, a patch I seriously considered applying\nfrom Michael Tokarev did a \"strcmp()\" to see if it was automount that\nwas doing the operation. Ugly, ugly.\n\nHowever, a prettier solution exists now thanks to the packetized pipe\nmode. By marking the communication pipe as being packetized (by simply\nsetting the O_DIRECT flag), we can always just write the bigger packet\nsize, and if user-space does a smaller read, it will just get that\npartial end result and the extra alignment padding will simply be thrown\naway.\n\nThis makes both automount and systemd happy, since they now get the size\nthey asked for, and the kernel side of autofs simply no longer needs to\ncare - it could pad out the packet arbitrarily.\n\nOf course, if there is some *other* user of autofs (please, please,\nplease tell me it ain\u0027t so - and we haven\u0027t heard of any) that tries to\nread the packets with multiple writes, that other user will now be\nbroken - the whole point of the packetized mode is that one system call\ngets exactly one packet, and you cannot read a packet in pieces.\n\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9883035ae7edef3ec62ad215611cb8e17d6a1a5d", "tree": "ab4afff1603e0f1e85e349b8a1fdb8415cc457cf", "parents": [ "de9e24eda331bbefb9195a4d646c786bdcbba7d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "message": "pipes: add a \"packetized pipe\" mode for writing\n\nThe actual internal pipe implementation is already really about\nindividual packets (called \"pipe buffers\"), and this simply exposes that\nas a special packetized mode.\n\nWhen we are in the packetized mode (marked by O_DIRECT as suggested by\nAlan Cox), a write() on a pipe will not merge the new data with previous\nwrites, so each write will get a pipe buffer of its own. The pipe\nbuffer is then marked with the PIPE_BUF_FLAG_PACKET flag, which in turn\nwill tell the reader side to break the read at that boundary (and throw\naway any partial packet contents that do not fit in the read buffer).\n\nEnd result: as long as you do writes less than PIPE_BUF in size (so that\nthe pipe doesn\u0027t have to split them up), you can now treat the pipe as a\npacket interface, where each read() system call will read one packet at\na time. You can just use a sufficiently big read buffer (PIPE_BUF is\nsufficient, since bigger than that doesn\u0027t guarantee atomicity anyway),\nand the return value of the read() will naturally give you the size of\nthe packet.\n\nNOTE! We do not support zero-sized packets, and zero-sized reads and\nwrites to a pipe continue to be no-ops. Also note that big packets will\ncurrently be split at write time, but that the size at which that\nhappens is not really specified (except that it\u0027s bigger than PIPE_BUF).\nCurrently that limit is the system page size, but we might want to\nexplicitly support bigger packets some day.\n\nThe main user for this is going to be the autofs packet interface,\nallowing us to stop having to care so deeply about exact packet sizes\n(which have had bugs with 32/64-bit compatibility modes). But user\nspace can create packetized pipes with \"pipe2(fd, O_DIRECT)\", which will\nfail with an EINVAL on kernels that do not support this interface.\n\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: stable@kernel.org # needed for systemd/autofs interaction fix\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "71dfc5fa5160bb73752f0731539404569a77faca", "tree": "d35919ad0d645b91404ca0d1717e5ffa00e89ae5", "parents": [ "e245d4250d0326cfcf7c816a2081b6ab2ea810be" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Sat Apr 28 19:32:21 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Apr 28 13:22:19 2012 -0400" }, "message": "NFS: get module in idmap PipeFS notifier callback\n\nThis is bug fix.\nNotifier callback is called from SUNRPC module. So before dereferencing NFS\nmodule we have to make sure, that it\u0027s alive.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f7b006931751f029620ad2f8310ac7a1484fbdb4", "tree": "71120f4c4c51752902317fbf853e3b0316c2adb0", "parents": [ "b990f9b3cb068578b8aefd3a34f8c8555661ef95", "dc7fdde39e4962b1a88741f7eba2a6b3be1285d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:30:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:30:07 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs fixes from Chris Mason:\n \"This has our collection of bug fixes. I missed the last rc because I\n thought our patches were making NFS crash during my xfs test runs.\n Turns out it was an NFS client bug fixed by someone else while I tried\n to bisect it.\n\n All of these fixes are small, but some are fairly high impact. The\n biggest are fixes for our mount -o remount handling, a deadlock due to\n GFP_KERNEL allocations in readdir, and a RAID10 error handling bug.\n\n This was tested against both 3.3 and Linus\u0027 master as of this morning.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (26 commits)\n Btrfs: reduce lock contention during extent insertion\n Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir\n Btrfs: Fix space checking during fs resize\n Btrfs: fix block_rsv and space_info lock ordering\n Btrfs: Prevent root_list corruption\n Btrfs: fix repair code for RAID10\n Btrfs: do not start delalloc inodes during sync\n Btrfs: fix that check_int_data mount option was ignored\n Btrfs: don\u0027t count CRC or header errors twice while scrubbing\n Btrfs: fix btrfs_ioctl_dev_info() crash on missing device\n btrfs: don\u0027t return EINTR\n Btrfs: double unlock bug in error handling\n Btrfs: always store the mirror we read the eb from\n fs/btrfs/volumes.c: add missing free_fs_devices\n btrfs: fix early abort in \u0027remount\u0027\n Btrfs: fix max chunk size check in chunk allocator\n Btrfs: add missing read locks in backref.c\n Btrfs: don\u0027t call free_extent_buffer twice in iterate_irefs\n Btrfs: Make free_ipath() deal gracefully with NULL pointers\n Btrfs: avoid possible use-after-free in clear_extent_bit()\n ...\n" }, { "commit": "fcbf94b9dedd2ce08e798a99aafc94fec8668161", "tree": "bc81982bbcf96538a09103b2c722ac7d2c99bdef", "parents": [ "c629eaf8392b676b4f83c3dc344e66402bfeec92" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 08:29:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 08:29:56 2012 -0700" }, "message": "Revert \"autofs: work around unhappy compat problem on x86-64\"\n\nThis reverts commit a32744d4abae24572eff7269bc17895c41bd0085.\n\nWhile that commit was technically the right thing to do, and made the\nx86-64 compat mode work identically to native 32-bit mode (and thus\nfixing the problem with a 32-bit systemd install on a 64-bit kernel), it\nturns out that the automount binaries had workarounds for this compat\nproblem.\n\nNow, the workarounds are disgusting: doing an \"uname()\" to find out the\narchitecture of the kernel, and then comparing it for the 64-bit cases\nand fixing up the size of the read() in automount for those. And they\nwere confused: it\u0027s not actually a generic 64-bit issue at all, it\u0027s\nvery much tied to just x86-64, which has different alignment for an\n\u0027u64\u0027 in 64-bit mode than in 32-bit mode.\n\nBut the end result is that fixing the compat layer actually breaks the\ncase of a 32-bit automount on a x86-64 kernel.\n\nThere are various approaches to fix this (including just doing a\n\"strcmp()\" on current-\u003ecomm and comparing it to \"automount\"), but I\nthink that I will do the one that teaches pipes about a special \"packet\nmode\", which will allow user space to not have to care too deeply about\nthe padding at the end of the autofs packet.\n\nThat change will make the compat workaround unnecessary, so let\u0027s revert\nit first, and get automount working again in compat mode. The\npacketized pipes will then fix autofs for systemd.\n\nReported-and-requested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: stable@kernel.org # for 3.3\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c629eaf8392b676b4f83c3dc344e66402bfeec92", "tree": "5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c", "parents": [ "4bbbf13fd55a9817452533934dee489683e703b8", "28f8881023c9713c303c0feda270929f9384c019" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 20:56:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 20:56:54 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 Use correct conversion specifiers in cifs_show_options\n CIFS: Show backupuid/gid in /proc/mounts\n cifs: fix offset handling in cifs_iovec_write\n" }, { "commit": "957265bd4fe182af757886f117416d66f68854aa", "tree": "177cee182ea61611f0b80db704203bf72ee4f3cb", "parents": [ "60c98d9abbd1ff3274b904027690f3c33d656250", "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 27 14:03:45 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Apr 27 14:03:45 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc4\u0027 into android-3.4\n" }, { "commit": "dc7fdde39e4962b1a88741f7eba2a6b3be1285d8", "tree": "97cd8b1f9d8c0682c64303d45de1fb55925abcdf", "parents": [ "fede766f28dd766d4e8feb321fdb19edb21ef6fb" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:31:29 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:51:05 2012 -0400" }, "message": "Btrfs: reduce lock contention during extent insertion\n\nWe\u0027re spending huge amounts of time on lock contention during\nend_io processing because we unconditionally assume we are overwriting\nan existing extent in the file for each IO.\n\nThis checks to see if we are outside i_size, and if so, it uses a\nless expensive readonly search of the btree to look for existing\nextents.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "fede766f28dd766d4e8feb321fdb19edb21ef6fb", "tree": "86e59f6bf94ad77c2fa1b232faa8f8b63b8675cb", "parents": [ "7654b72417e10e294563496e25211200f9b8b6d3" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:23:22 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:23:22 2012 -0400" }, "message": "Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir\n\nBtrfs has an optimization where it will preallocate dentries during\nreaddir to fill in enough information to open the inode without an extra\nlookup.\n\nBut, we\u0027re calling d_alloc, which is doing GFP_KERNEL allocations, and\nthat leads to deadlocks because our readdir code has tree locks held.\n\nFor now, disable this optimization. We\u0027ll fix the gfp mask in the next\nmerge window.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e245d4250d0326cfcf7c816a2081b6ab2ea810be", "tree": "1424c497bdcd1305137b18201a3086a365595a72", "parents": [ "7e6eb683d260d9325f0d1bd911518d5ed3cb4f0c" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:43 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:03 2012 -0400" }, "message": "NFS: Remove unused function nfs_lookup_with_sec()\n\nThis fixes a compiler warning.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7e6eb683d260d9325f0d1bd911518d5ed3cb4f0c", "tree": "51b22645b2e55cff65acf9feb0d9f43f44ed70d3", "parents": [ "f05d147f7e3cf0d86b3a4bd5603029a7cb109633" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:42 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:03 2012 -0400" }, "message": "NFS: Honor the authflavor set in the clone mount data\n\nThe authflavor is set in an nfs_clone_mount structure and passed to the\nxdev_mount() functions where it was promptly ignored. Instead, use it\nto initialize an rpc_clnt for the cloned server.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "f05d147f7e3cf0d86b3a4bd5603029a7cb109633", "tree": "e351ef7dd3d541626f5cccef86f50906bfb3a649", "parents": [ "72de53ec4bca39c26709122a8f78bfefe7b6bca4" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:41 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:02 2012 -0400" }, "message": "NFS: Fix following referral mount points with different security\n\nI create a new proc_lookup_mountpoint() to use when submounting an NFS\nv4 share. This function returns an rpc_clnt to use for performing an\nfs_locations() call on a referral\u0027s mountpoint.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "72de53ec4bca39c26709122a8f78bfefe7b6bca4", "tree": "dac32c44281b153df7104037c1e97c11deffae69", "parents": [ "db0a9593d52f935c80085d8993bdcead1ad30b0c" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:40 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:02 2012 -0400" }, "message": "NFS: Do secinfo as part of lookup\n\nWhenever lookup sees wrongsec do a secinfo and retry the lookup to find\nattributes of the file or directory, such as \"is this a referral\nmountpoint?\". This also allows me to remove handling -NFS4ERR_WRONSEC\nas part of getattr xdr decoding.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "db0a9593d52f935c80085d8993bdcead1ad30b0c", "tree": "e0ca32d8d4366042479cb2a87d6fe87998a9849f", "parents": [ "31e4dda4747713de13889f7c79c7aec341fea61b" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:39 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:01 2012 -0400" }, "message": "NFS: Handle exceptions coming out of nfs4_proc_fs_locations()\n\nWe don\u0027t want to return -NFS4ERR_WRONGSEC to the VFS because it could\ncause the kernel to oops.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "31e4dda4747713de13889f7c79c7aec341fea61b", "tree": "9ec536cc095e2e512d1863301dcf37ca92dde8b5", "parents": [ "ea8cfa06795bb30d2ea61f503ef129284492c06a" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Fri Apr 27 13:27:38 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:01 2012 -0400" }, "message": "NFS: Fix SECINFO_NO_NAME\n\nI was using the same decoder function for SECINFO and SECINFO_NO_NAME,\nso it was returning an error when it tried to decode an OP_SECINFO_NO_NAME\nheader as OP_SECINFO.\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "5794d21ef4639f0e33440927bb903f9598c21e92", "tree": "d4bdbde63624df6e970751f46fd6fe0dacb8718c", "parents": [ "5a00689930ab975fdd1b37b034475017e460cf2a" ], "author": { "name": "Sachin Prabhu", "email": "sprabhu@redhat.com", "time": "Tue Apr 17 14:36:40 2012 +0100" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:53 2012 -0400" }, "message": "Avoid beyond bounds copy while caching ACL\n\nWhen attempting to cache ACLs returned from the server, if the bitmap\nsize + the ACL size is greater than a PAGE_SIZE but the ACL size itself\nis smaller than a PAGE_SIZE, we can read past the buffer page boundary.\n\nSigned-off-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nReported-by: Jian Li \u003cjiali@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7654b72417e10e294563496e25211200f9b8b6d3", "tree": "5ca24ea9bb735133c0e09a789d3eb50d9a8b69b4", "parents": [ "1f699d38b6556c393ac80f1c23c2053502a51631" ], "author": { "name": "Daniel J Blueman", "email": "daniel@quora.org", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:14 2012 -0400" }, "message": "Btrfs: Fix space checking during fs resize\n\nFix out-of-space checking, addressing a warning and potential resource\nleak when resizing the filesystem down while allocating blocks.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel@quora.org\u003e\nReviewed-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1f699d38b6556c393ac80f1c23c2053502a51631", "tree": "9ba8e3c95cc044461eab17dfba50515535ca2a25", "parents": [ "1daf3540fa77faea2f91d96bcaf07ce48ee827be" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:14 2012 -0400" }, "message": "Btrfs: fix block_rsv and space_info lock ordering\n\nmay_commit_transaction() calls\n spin_lock(\u0026space_info-\u003elock);\n spin_lock(\u0026delayed_rsv-\u003elock);\nand update_global_block_rsv() calls\n spin_lock(\u0026block_rsv-\u003elock);\n spin_lock(\u0026sinfo-\u003elock);\n\nLockdep complains about this at run time.\nEverywhere except in update_global_block_rsv(), the space_info lock is\nthe outer lock, therefore the locking order in update_global_block_rsv()\nis changed.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1daf3540fa77faea2f91d96bcaf07ce48ee827be", "tree": "0cdec92cca58085352b7ba8f4c3245a91dd0b5a9", "parents": [ "3e74317ad773ba9df36db1fa32848cba41ac4d1a" ], "author": { "name": "Daniel J Blueman", "email": "daniel@quora.org", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:13 2012 -0400" }, "message": "Btrfs: Prevent root_list corruption\n\nI was seeing root_list corruption on unmount during fs resize in 3.4-rc4; add\ncorrect locking to address this.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel@quora.org\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3e74317ad773ba9df36db1fa32848cba41ac4d1a", "tree": "ad017d3a85aeaf32dbfd5c63312ff200502d33a7", "parents": [ "996d282c7ff470f150a467eb4815b90159d04c47" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Fri Apr 27 12:41:45 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:13 2012 -0400" }, "message": "Btrfs: fix repair code for RAID10\n\nbtrfs_map_block sets mirror_num, so that the repair code knows eventually\nwhich device gave us the read error. For RAID10, mirror_num must be 1 or 2.\nBefore this fix mirror_num was incorrectly related to our stripe index.\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "996d282c7ff470f150a467eb4815b90159d04c47", "tree": "e6dcab1fc9db79eff901aa3ea07d01ddc734999a", "parents": [ "25cd999e1a685dab65292afbe9fa24d790d8a859" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Apr 23 20:35:03 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:12 2012 -0400" }, "message": "Btrfs: do not start delalloc inodes during sync\n\nbtrfs_start_delalloc_inodes will just walk the list of delalloc inodes and\nstart writing them out, but it doesn\u0027t splice the list or anything so as\nlong as somebody is doing work on the box you could end up in this section\n_forever_. So just remove it, it\u0027s not needed anyway since sync will start\nwriteback on all inodes anyway, all we need to do is wait for ordered\nextents and then we can commit the transaction. In my horrible torture test\nsync goes from taking 4 minutes to about 1.5 minutes. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5a00689930ab975fdd1b37b034475017e460cf2a", "tree": "9cc6df10ac849488efe28ea811e55c213c22a754", "parents": [ "10bd295a0b6488ebe634b72a11d8986bd3af3819" ], "author": { "name": "Sachin Prabhu", "email": "sprabhu@redhat.com", "time": "Tue Apr 17 14:35:39 2012 +0100" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 13:15:07 2012 -0400" }, "message": "Avoid reading past buffer when calling GETACL\n\nBug noticed in commit\nbf118a342f10dafe44b14451a1392c3254629a1f\n\nWhen calling GETACL, if the size of the bitmap array, the length\nattribute and the acl returned by the server is greater than the\nallocated buffer(args.acl_len), we can Oops with a General Protection\nfault at _copy_from_pages() when we attempt to read past the pages\nallocated.\n\nThis patch allocates an extra PAGE for the bitmap and checks to see that\nthe bitmap + attribute_length + ACLs don\u0027t exceed the buffer space\nallocated to it.\n\nSigned-off-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nReported-by: Jian Li \u003cjiali@redhat.com\u003e\n[Trond: Fixed a size_t vs unsigned int printk() warning]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "110a5c8b389407e1e859c43293179f9089671a60", "tree": "83245c842a809ecd728f12814a344e7224109d7a", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc", "6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton:\n \"13 fixes. The acerhdf patches aren\u0027t (really) fixes. But they\u0027ve\n been stuck in my tree for up to two years, sent to Matthew multiple\n times and the developers are unhappy.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (13 patches)\n mm: fix NULL ptr dereference in move_pages\n mm: fix NULL ptr dereference in migrate_pages\n revert \"proc: clear_refs: do not clear reserved pages\"\n drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled\n arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file\n hugetlbfs: lockdep annotate root inode properly\n acerhdf: lowered default temp fanon/fanoff values\n acerhdf: add support for new hardware\n acerhdf: add support for Aspire 1410 BIOS v1.3314\n fs/buffer.c: remove BUG() in possible but rare condition\n mm: fix up the vmscan stat in vmstat\n epoll: clear the tfile_check_list on -ELOOP\n mm/hugetlb: fix warning in alloc_huge_page/dequeue_huge_page_vma\n" }, { "commit": "10bd295a0b6488ebe634b72a11d8986bd3af3819", "tree": "8c9fec0f15e1a64fe1d1aa58b42c61d8b2108666", "parents": [ "e5265a0c587423bbd21a6b39a572cecff16b9346" ], "author": { "name": "Jim Rees", "email": "rees@umich.edu", "time": "Mon Apr 09 22:33:39 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 26 12:23:23 2012 -0400" }, "message": "fix page number calculation bug for block layout decode buffer\n\nSigned-off-by: Jim Rees \u003crees@umich.edu\u003e\nSuggested-by: Andy Adamson \u003candros@netapp.com\u003e\nSuggested-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "e5265a0c587423bbd21a6b39a572cecff16b9346", "tree": "0ed40a362520b8ac6d2c001ca5280fd240fdb555", "parents": [ "9526b2b6d6b9f183b66cf21c4afa6e79d5a14f44" ], "author": { "name": "Andy Adamson", "email": "andros@netapp.com", "time": "Sat Apr 14 03:56:35 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 26 12:23:23 2012 -0400" }, "message": "NFSv4.1 fix page number calculation bug for filelayout decode buffers\n\nSigned-off-by: Andy Adamson \u003candros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "9526b2b6d6b9f183b66cf21c4afa6e79d5a14f44", "tree": "d06b4a2020bd96c6c8fcb9aa306ccd7c93445637", "parents": [ "1aba1567637b93eee32253b42deaaad381c3175b" ], "author": { "name": "Sachin Bhamare", "email": "sbhamare@panasas.com", "time": "Fri Mar 30 14:29:59 2012 -0700" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 26 12:15:51 2012 -0400" }, "message": "pnfs-obj: Remove unused variable from objlayout_get_deviceinfo()\n\nLocal variable \u0027sb\u0027 was not being used in objlayout_get_deviceinfo().\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": "1aba1567637b93eee32253b42deaaad381c3175b", "tree": "a1bc797ef749f93d39a2112022fefcb29bfa68f0", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc" ], "author": { "name": "Weston Andros Adamson", "email": "dros@netapp.com", "time": "Tue Apr 24 16:50:37 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 26 12:11:29 2012 -0400" }, "message": "nfs4: fix referrals on mounts that use IPv6 addrs\n\nAll referrals (IPv4 addr, IPv6 addr, and DNS) are broken on mounts of\nIPv6 addresses, because validation code uses a path that is parsed\nfrom the dev_name (\"\u003cserver\u003e:\u003cpath\u003e\") by splitting on the first colon and\ncolons are used in IPv6 addrs.\nThis patch ignores colons within IPv6 addresses that are escaped by \u0027[\u0027 and \u0027]\u0027.\n\nSigned-off-by: Weston Andros Adamson \u003cdros@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "2300fd67b4f29eec19addb15a8571837228f63fc", "tree": "5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76", "parents": [ "86ec090e58fca1025676e775093a87ab699f7f4d", "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix NFSv4 infinite loops on open(O_TRUNC)\n - Fix an Oops and an infinite loop in the NFSv4 flock code\n - Don\u0027t register the PipeFS filesystem until it has been set up\n - Fix an Oops in nfs_try_to_update_request\n - Don\u0027t reuse NFSv4 open owners: fixes a bad sequence id storm.\n\n* tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Keep dropped state owners on the LRU list for a while\n NFSv4: Ensure that we don\u0027t drop a state owner more than once\n NFSv4: Ensure we do not reuse open owner names\n nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n NFS: put open context on error in nfs_flush_multi\n NFS: put open context on error in nfs_pagein_multi\n NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n NFSv4: Ensure that we check lock exclusive/shared type against open modes\n NFSv4: Ensure that the LOCK code sets exception-\u003einode\n NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n SUNRPC: register PipeFS file system after pernet sybsystem\n" }, { "commit": "63f61a6f4633ff34c17bea7a0ed827eaeb0733e1", "tree": "5f8ae725b84635f441485ff6d68d6c105ebb8292", "parents": [ "3f5ec5e06d6ca88168277247dbac0ec7b501600f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Wed Apr 25 16:01:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "revert \"proc: clear_refs: do not clear reserved pages\"\n\nRevert commit 85e72aa5384 (\"proc: clear_refs: do not clear reserved\npages\"), which was a quick fix suitable for -stable until ARM had been\nmoved over to the gate_vma mechanism:\n\nhttps://lkml.org/lkml/2012/1/14/55\n\nWith commit f9d4861f (\"ARM: 7294/1: vectors: use gate_vma for vectors user\nmapping\"), ARM does now use the gate_vma, so the PageReserved check can be\nremoved from the proc code.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-by: 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": "65ed76010dfed3cb75c863c9052c367a1bacf80a", "tree": "c4b21b9d6f48e1a90d095ddea09b40e38c97164e", "parents": [ "351963bb58af5717359544087b9f634c27b9b155" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Wed Apr 25 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "hugetlbfs: lockdep annotate root inode properly\n\nThis fixes the below reported false lockdep warning. e096d0c7e2e4\n(\"lockdep: Add helper function for dir vs file i_mutex annotation\") added\na similar annotation for every other inode in hugetlbfs but missed the\nroot inode because it was allocated by a separate function.\n\nFor HugeTLB fs we allow taking i_mutex in mmap. HugeTLB fs doesn\u0027t\nsupport file write and its file read callback is modified in a05b0855fd\n(\"hugetlbfs: avoid taking i_mutex from hugetlbfs_read()\") to not take\ni_mutex. Hence for HugeTLB fs with regular files we really don\u0027t take\ni_mutex with mmap_sem held.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n [ INFO: possible circular locking dependency detected ]\n 3.4.0-rc1+ #322 Not tainted\n -------------------------------------------------------\n bash/1572 is trying to acquire lock:\n (\u0026mm-\u003emmap_sem){++++++}, at: [\u003cffffffff810f1618\u003e] might_fault+0x40/0x90\n\n but task is already holding lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}, at: [\u003cffffffff81125f88\u003e] vfs_readdir+0x56/0xa8\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}:\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff816a2f5e\u003e] __mutex_lock_common+0x48/0x350\n [\u003cffffffff816a3325\u003e] mutex_lock_nested+0x2a/0x31\n [\u003cffffffff811fb8e1\u003e] hugetlbfs_file_mmap+0x7d/0x104\n [\u003cffffffff810f859a\u003e] mmap_region+0x272/0x47d\n [\u003cffffffff810f8a39\u003e] do_mmap_pgoff+0x294/0x2ee\n [\u003cffffffff810f8b65\u003e] sys_mmap_pgoff+0xd2/0x10e\n [\u003cffffffff8103d19e\u003e] sys_mmap+0x1d/0x1f\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\n -\u003e #0 (\u0026mm-\u003emmap_sem){++++++}:\n [\u003cffffffff810a0256\u003e] __lock_acquire+0xa81/0xd75\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff810f1645\u003e] might_fault+0x6d/0x90\n [\u003cffffffff81125d62\u003e] filldir+0x6a/0xc2\n [\u003cffffffff81133a83\u003e] dcache_readdir+0x5c/0x222\n [\u003cffffffff81125fa8\u003e] vfs_readdir+0x76/0xa8\n [\u003cffffffff811260b6\u003e] sys_getdents+0x79/0xc9\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\n other info that might help us debug this:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(\u0026sb-\u003es_type-\u003ei_mutex_key#12);\n lock(\u0026mm-\u003emmap_sem);\n lock(\u0026sb-\u003es_type-\u003ei_mutex_key#12);\n lock(\u0026mm-\u003emmap_sem);\n\n *** DEADLOCK ***\n\n 1 lock held by bash/1572:\n #0: (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}, at: [\u003cffffffff81125f88\u003e] vfs_readdir+0x56/0xa8\n\n stack backtrace:\n Pid: 1572, comm: bash Not tainted 3.4.0-rc1+ #322\n Call Trace:\n [\u003cffffffff81699a3c\u003e] print_circular_bug+0x1f8/0x209\n [\u003cffffffff810a0256\u003e] __lock_acquire+0xa81/0xd75\n [\u003cffffffff810f38aa\u003e] ? handle_pte_fault+0x5ff/0x614\n [\u003cffffffff8109e622\u003e] ? mark_lock+0x2d/0x258\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff816a3249\u003e] ? __mutex_lock_common+0x333/0x350\n [\u003cffffffff810f1645\u003e] might_fault+0x6d/0x90\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff81125d62\u003e] filldir+0x6a/0xc2\n [\u003cffffffff81133a83\u003e] dcache_readdir+0x5c/0x222\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125fa8\u003e] vfs_readdir+0x76/0xa8\n [\u003cffffffff811260b6\u003e] sys_getdents+0x79/0xc9\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Josh Boyer \u003cjwboyer@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "61065a30af8df4b8989c2ac7a1f4b4034e4df2d5", "tree": "3b446b3d81e996ce15901a57e85bab10fcbd8899", "parents": [ "904249aa68010c8e223263c922fcbb840a3f42e4" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Wed Apr 25 16:01:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "fs/buffer.c: remove BUG() in possible but rare condition\n\nWhile stressing the kernel with with failing allocations today, I hit the\nfollowing chain of events:\n\nalloc_page_buffers():\n\n\tbh \u003d alloc_buffer_head(GFP_NOFS);\n\tif (!bh)\n\t\tgoto no_grow; \u003c\u003d path taken\n\ngrow_dev_page():\n bh \u003d alloc_page_buffers(page, size, 0);\n if (!bh)\n goto failed; \u003c\u003d taken, consequence of the above\n\nand then the failed path BUG()s the kernel.\n\nThe failure is inserted a litte bit artificially, but even then, I see no\nreason why it should be deemed impossible in a real box.\n\nEven though this is not a condition that we expect to see around every\ntime, failed allocations are expected to be handled, and BUG() sounds just\ntoo much. As a matter of fact, grow_dev_page() can return NULL just fine\nin other circumstances, so I propose we just remove it, then.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Michal Hocko \u003cmhocko@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": "13d518074a952d33d47c428419693f63389547e9", "tree": "75ccd438b6579840f51b96eed7a5e760e6caf2eb", "parents": [ "b1c12cbcd0a02527c180a862e8971e249d3b347d" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Wed Apr 25 16:01:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "epoll: clear the tfile_check_list on -ELOOP\n\nAn epoll_ctl(,EPOLL_CTL_ADD,,) operation can return \u0027-ELOOP\u0027 to prevent\ncircular epoll dependencies from being created. However, in that case we\ndo not properly clear the \u0027tfile_check_list\u0027. Thus, add a call to\nclear_tfile_check_list() for the -ELOOP case.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nReported-by: Yurij M. Plotnikov \u003cYurij.Plotnikov@oktetlabs.ru\u003e\nCc: Nelson Elhage \u003cnelhage@nelhage.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nTested-by: Alexandra N. Kossovsky \u003cAlexandra.Kossovsky@oktetlabs.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "28f8881023c9713c303c0feda270929f9384c019", "tree": "3e533cb1ca1594b0ed61aaed444bcb54f9ba8b53", "parents": [ "3c7c87fd5bd71f57c68a64d11a15170d0dc4f7aa" ], "author": { "name": "Sachin Prabhu", "email": "sprabhu@redhat.com", "time": "Tue Apr 24 15:28:30 2012 +0100" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Tue Apr 24 11:36:25 2012 -0500" }, "message": "Use correct conversion specifiers in cifs_show_options\n\ncifs_show_options uses the wrong conversion specifier for uid, gid,\nrsize \u0026 wsize. Correct this to %u to match it to the variable type\n\u0027unsigned integer\u0027.\n\nSigned-off-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "3c7c87fd5bd71f57c68a64d11a15170d0dc4f7aa", "tree": "0bc095535ad62f5cd235a856f1e190fb7a4b6c6e", "parents": [ "3af9d8f227a31e25b3110ef175d105798fc147a6" ], "author": { "name": "Sachin Prabhu", "email": "sprabhu@redhat.com", "time": "Tue Apr 24 15:28:14 2012 +0100" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Tue Apr 24 11:36:22 2012 -0500" }, "message": "CIFS: Show backupuid/gid in /proc/mounts\n\nShow backupuid/backupgid in /proc/mounts for cifs shares mounted with\nthe backupuid/backupgid feature.\n\nAlso consolidate the two separate checks for\npvolume_info-\u003ebackupuid_specified into a single if condition in\ncifs_setup_cifs_sb().\n\nSigned-off-by: Sachin Prabhu \u003csprabhu@redhat.com\u003e\nReviewed-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "4c569a72c30dfee9b5133284aba67e3aa0c9505d", "tree": "774da90a4b3be800de638d6b2cda4ab7e15a3720", "parents": [ "95f714727436836bb46236ce2bcd8ee8f9274aed" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Tue Apr 10 14:45:24 2012 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Tue Apr 24 13:26:50 2012 +0100" }, "message": "GFS2: Instruct DLM to avoid queue convert slowdown\n\nThis patch instructs DLM to prevent an \"in place\" conversion, where the\nlock just stays on the granted queue, and instead forces the conversion to\nthe back of the convert queue. This is done on upward conversions only.\n \nThis is useful in cases where, for example, a lock is frequently needed in\nPR on one node, but another node needs it temporarily in EX to update it.\nThis may happen, for example, when the rindex is being updated by gfs2_grow.\nThe gfs2_grow needs to have the lock in EX, but the other nodes need to\nre-read it to retrieve the updates. The glock is already granted in PR on\nthe non-growing nodes, so this prevents them from continually re-granting\nthe lock in PR, and forces the EX from gfs2_grow to go through.\n\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n\n" }, { "commit": "95f714727436836bb46236ce2bcd8ee8f9274aed", "tree": "200ea790bf3299c9120b65b890ac85f56337d848", "parents": [ "ce1ee9f5b99fa4ba332692194aa57b604112762f", "db7e5c668e1b16061fe2d94d3cba022dd360c5d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 23 19:52:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 23 19:52:00 2012 -0700" }, "message": "Merge tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 bug fixes from Ted Ts\u0027o:\n \"These are two low-risk bug fixes for ext4, fixing a compile warning\n and a potential deadlock.\"\n\n* tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n super.c: unused variable warning without CONFIG_QUOTA\n jbd2: use GFP_NOFS for blkdev_issue_flush\n" }, { "commit": "db7e5c668e1b16061fe2d94d3cba022dd360c5d4", "tree": "942cb61ff0c34ccbf73184c99114bc44c92ccc5d", "parents": [ "99aa78466777083255b876293e9e83dec7cd809a" ], "author": { "name": "Eldad Zack", "email": "eldad@fogrefinery.com", "time": "Sun Apr 22 17:50:52 2012 +0200" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Apr 23 21:44:41 2012 -0400" }, "message": "super.c: unused variable warning without CONFIG_QUOTA\n\nsb info is only checked with quota support.\n\nfs/ext4/super.c: In function ‘parse_options’:\nfs/ext4/super.c:1600:23: warning: unused variable ‘sbi’ [-Wunused-variable]\n\nSigned-off-by: Eldad Zack \u003celdad@fogrefinery.com\u003e\nSigned-off-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\n" }, { "commit": "99aa78466777083255b876293e9e83dec7cd809a", "tree": "e15bd88760cb27bb306929b19ba41abc53e0e333", "parents": [ "57f73c2c89a5d3b2ed87201c8100d1fa989a1a65" ], "author": { "name": "Shaohua Li", "email": "shli@kernel.org", "time": "Fri Apr 13 10:27:35 2012 +0800" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Apr 23 21:43:41 2012 -0400" }, "message": "jbd2: use GFP_NOFS for blkdev_issue_flush\n\nflush request is issued in transaction commit code path, so looks using\nGFP_KERNEL to allocate memory for flush request bio falls into the classic\ndeadlock issue. I saw btrfs and dm get it right, but ext4, xfs and md are\nusing GFP.\n\nSigned-off-by: Shaohua Li \u003cshli@fusionio.com\u003e\nSigned-off-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nReviewed-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "721b024bd47c1e4b995e7eeb6455b714b817ad60", "tree": "15e3374ad054cc9ecbea56a86c1ff0b3f94a3b1c", "parents": [ "aca50bd3b4c4bb5528a1878158ba7abce41de534", "53ad1c980d4fb450722a575ca17c188808939340" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 23 18:22:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 23 18:22:42 2012 -0700" }, "message": "Merge tag \u0027dlm-fixes-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm\n\nPull dlm fixes from David Teigland:\n \"This includes one short patch fixing the behavior of the QUECVT flag,\n which the gfs2 folks are waiting on.\"\n\n* tag \u0027dlm-fixes-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:\n dlm: fix QUECVT when convert queue is empty\n" }, { "commit": "53ad1c980d4fb450722a575ca17c188808939340", "tree": "9c9829d7aff8eab4b7c407f51227ed873b3df1bb", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "David Teigland", "email": "teigland@redhat.com", "time": "Wed Apr 04 09:49:15 2012 -0500" }, "committer": { "name": "David Teigland", "email": "teigland@redhat.com", "time": "Mon Apr 23 11:30:59 2012 -0500" }, "message": "dlm: fix QUECVT when convert queue is empty\n\nThe QUECVT flag should not prevent conversions from\nbeing granted immediately when the convert queue is\nempty.\n\nSigned-off-by: David Teigland \u003cteigland@redhat.com\u003e\n" }, { "commit": "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01", "tree": "e2b24a12db92f9ae9c99b4a3d9d7ef462dd16429", "parents": [ "c77365c963cf8703ecf1004cd3b298068a3e1b76" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Apr 21 12:36:19 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Apr 21 13:01:00 2012 -0400" }, "message": "NFSv4: Keep dropped state owners on the LRU list for a while\n\nTo ensure that we don\u0027t reuse their identifiers.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c77365c963cf8703ecf1004cd3b298068a3e1b76", "tree": "449a02a25c425148a52c5bec073787902ad86fed", "parents": [ "95b72eb0bdef6476b7e73061f0382adf46c5495a" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Apr 21 12:31:05 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat Apr 21 12:31:05 2012 -0400" }, "message": "NFSv4: Ensure that we don\u0027t drop a state owner more than once\n\nRetest the RB_EMPTY_NODE() condition under the spin lock\nto ensure that we don\u0027t call rb_erase() more than once on the\nsame state owner.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "bfce281c287a427d0841fadf5d59242757b4e620", "tree": "abca9ebeef4c668021e85e4d54e6e779121e92cc", "parents": [ "9f3a4afb276e4d8b3be7f3e678d4dbd11470416f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 20 21:57:04 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 21 01:58:20 2012 -0400" }, "message": "kill mm argument of vm_munmap()\n\nit\u0027s always current-\u003emm\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "936af1576e4c24b466380fc2b8d93352161d13b0", "tree": "b7ecc2a4706ab25b0d06af7bac5fdf5d0fc7acb5", "parents": [ "6be5ceb02e98eaf6cfc4f8b12a896d04023f340d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 20 21:49:41 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 21 01:58:16 2012 -0400" }, "message": "aio: don\u0027t bother with unmapping when aio_free_ring() is coming from exit_aio()\n\n... since exit_mmap() is coming and it will munmap() everything anyway.\nIn all other cases aio_free_ring() has ctx-\u003emm \u003d\u003d current-\u003emm; moreover,\nall other callers of vm_munmap() have mm \u003d\u003d current-\u003emm, so this will\nallow us to get rid of mm argument of vm_munmap().\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "95b72eb0bdef6476b7e73061f0382adf46c5495a", "tree": "db1cbb01793ac5f744defb73e869373fefb7d0ce", "parents": [ "98a2139f4f4d7b5fcc3a54c7fddbe88612abed20" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 19:24:51 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 23:14:28 2012 -0400" }, "message": "NFSv4: Ensure we do not reuse open owner names\n\nThe NFSv4 spec is ambiguous about whether or not it is permissible\nto reuse open owner names, so play it safe. This patch adds a timestamp\nto the state_owner structure, and combines that with the IDA based\nuniquifier.\nFixes a regression whereby the Linux server returns NFS4ERR_BAD_SEQID.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "6be5ceb02e98eaf6cfc4f8b12a896d04023f340d", "tree": "f34de1392300bbf63549f4eeb20f7606d6f7b1f9", "parents": [ "a46ef99d80817a167477ed1c8b4d90ee0c2e726f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:13:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_mmap()\" helper function\n\nThis continues the theme started with vm_brk() and vm_munmap():\nvm_mmap() does the same thing as do_mmap(), but additionally does the\nrequired VM locking.\n\nThis uninlines (and rewrites it to be clearer) do_mmap(), which sadly\nduplicates it in mm/mmap.c and mm/nommu.c. But that way we don\u0027t have\nto export our internal do_mmap_pgoff() function.\n\nSome day we hopefully don\u0027t have to export do_mmap() either, if all\nmodular users can become the simpler vm_mmap() instead. We\u0027re actually\nvery close to that already, with the notable exception of the (broken)\nuse in i810, and a couple of stragglers in binfmt_elf.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a46ef99d80817a167477ed1c8b4d90ee0c2e726f", "tree": "3d8c980c627e8b9c009dbf63628a9be8b8d1069f", "parents": [ "e4eb1ff61b323d6141614e5458a1f53c7046ff8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 16:20:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:29:13 2012 -0700" }, "message": "VM: add \"vm_munmap()\" helper function\n\nLike the vm_brk() function, this is the same as \"do_munmap()\", except it\ndoes the VM locking for the caller.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4eb1ff61b323d6141614e5458a1f53c7046ff8e", "tree": "7a0251509c169b0df1a6bf4bc47c5bca709e06da", "parents": [ "3b422e9c2c020a1137349c614da7f9c9761a0922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 15:35:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 20 17:28:17 2012 -0700" }, "message": "VM: add \"vm_brk()\" helper function\n\nIt does the same thing as \"do_brk()\", except it handles the VM locking\ntoo.\n\nIt turns out that all external callers want that anyway, so we can make\ndo_brk() static to just mm/mmap.c while at it.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "98a2139f4f4d7b5fcc3a54c7fddbe88612abed20", "tree": "99f94d7fabedefbae0a6e40a1c8f485171616565", "parents": [ "8ccd271f7a3a846ce6f85ead0760d9d12994a611" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Sat Sep 03 01:09:43 2011 +0200" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 17:59:01 2012 -0400" }, "message": "nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n\nWhen hostname contains colon (e.g. when it is an IPv6 address) it needs\nto be enclosed in brackets to make parsing of NFS device string possible.\nFix nfs_do_root_mount() to enclose hostname properly when needed. NFS code\nactually does not need this as it does not parse the string passed by\nnfs_do_root_mount() but the device string is exposed to userspace in\n/proc/mounts.\n\nCC: Josh Boyer \u003cjwboyer@redhat.com\u003e\nCC: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" } ], "next": "8ccd271f7a3a846ce6f85ead0760d9d12994a611" }