)]}' { "log": [ { "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": "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" }, { "commit": "8ccd271f7a3a846ce6f85ead0760d9d12994a611", "tree": "6f85cdf26023d05f2160f472318bac591233fa75", "parents": [ "73fb7bc7c57d971b11f2e00536ac2d3e316e0609" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Apr 20 14:47:35 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 14:57:30 2012 -0400" }, "message": "NFS: put open context on error in nfs_flush_multi\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "73fb7bc7c57d971b11f2e00536ac2d3e316e0609", "tree": "0c7811107bb4060c7cededa08492f4c004fc2ae8", "parents": [ "451146be933e26e21277852b5e40c6a52266ef96" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Fri Apr 20 14:47:34 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 20 14:54:48 2012 -0400" }, "message": "NFS: put open context on error in nfs_pagein_multi\n\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "3af9d8f227a31e25b3110ef175d105798fc147a6", "tree": "0431c865502651114d43d5635802a2f949a55a7e", "parents": [ "c6f5c93098f5577210f8f3ea22209b3f266c66af" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Fri Apr 13 17:16:59 2012 -0400" }, "committer": { "name": "Steve French", "email": "sfrench@us.ibm.com", "time": "Thu Apr 19 22:16:33 2012 -0500" }, "message": "cifs: fix offset handling in cifs_iovec_write\n\nIn the recent update of the cifs_iovec_write code to use async writes,\nthe handling of the file position was broken. That patch added a local\n\"offset\" variable to handle the offset, and then only updated the\noriginal \"*poffset\" before exiting.\n\nUnfortunately, it copied off the original offset from the beginning,\ninstead of doing so after generic_write_checks had been called. Fix\nthis by moving the initialization of \"offset\" after that in the\nfunction.\n\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Steve French \u003csfrench@us.ibm.com\u003e\n" }, { "commit": "c6f5c93098f5577210f8f3ea22209b3f266c66af", "tree": "bc641dfb6f71b6584cedde4b6721ca716f8bf3d0", "parents": [ "19853301ef3289bda2d5264c1093e74efddaeab9", "d22053cdbd914a6c97ea101adf411a8fd7e282ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 19 14:54:52 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux\n\nPull nfsd bugfixes from J. Bruce Fields:\n \"One bugfix, and one minor header fix from Jeff Layton while we\u0027re\n here\"\n\n* \u0027for-3.4\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd: include cld.h in the headers_install target\n nfsd: don\u0027t fail unchecked creates of non-special files\n" }, { "commit": "ab2965eefef95a2eecfd54c12b0eb243162862e9", "tree": "c947fdc158e144c2d060486b65d10ee67d254039", "parents": [ "a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595", "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc3\u0027 into android-3.4\n\nConflicts:\n\tdrivers/staging/android/lowmemorykiller.c\n\nChange-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306\n" }, { "commit": "451146be933e26e21277852b5e40c6a52266ef96", "tree": "207795769b9e1b18952f67fda9db5c7259fb9d63", "parents": [ "55725513b5ef9d462aa3e18527658a0362aaae83" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 16:29:11 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 19 13:23:09 2012 -0400" }, "message": "NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n\nIf the file wasn\u0027t opened for writing, then truncate and ftruncate\nneed to report the appropriate errors.\n\nReported-by: Miklos Szeredi \u003cmiklos@szeredi.hu\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "55725513b5ef9d462aa3e18527658a0362aaae83", "tree": "e258eff89b9c1b72a4c1e6ff136ddd477c8ca9ef", "parents": [ "05ffe24f5290dc095f98fbaf84afe51ef404ccc5" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 12:48:35 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 19 13:23:08 2012 -0400" }, "message": "NFSv4: Ensure that we check lock exclusive/shared type against open modes\n\nSince we may be simulating flock() locks using NFS byte range locks,\nwe can\u0027t rely on the VFS having checked the file open mode for us.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "05ffe24f5290dc095f98fbaf84afe51ef404ccc5", "tree": "555ddc0f2266861b3532ea1ab9d70def1176ab55", "parents": [ "ca138f368a36dba40d3ef4a53d64af2011cda3c7" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 12:20:10 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu Apr 19 13:23:00 2012 -0400" }, "message": "NFSv4: Ensure that the LOCK code sets exception-\u003einode\n\nAll callers of nfs4_handle_exception() that need to handle\nNFS4ERR_OPENMODE correctly should set exception-\u003einode\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "dbfad21422f8d2c0866185b3e449c4a6ebaec4e2", "tree": "a30de27f59ddce92ba9b950d5bb1b20ff23191b4", "parents": [ "743e89ebc0215900040b1c2d1563d70a22ac2cb0", "c628ee67fb15a0d8d48351aa2e487c5f14779785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 18 17:29:05 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\nPull fuse updates from Miklos Szeredi.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: use flexible array in fuse.h\n fuse: allow nanosecond granularity\n fuse: O_DIRECT support for files\n fuse: fix nlink after unlink\n" }, { "commit": "25cd999e1a685dab65292afbe9fa24d790d8a859", "tree": "56e2c7ceefddd657046f87eca111e2265cf00141", "parents": [ "5c84fc3c3914e9adfa6155a167c6c0c2709e6a62" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Fri Mar 30 13:58:32 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:38 2012 +0200" }, "message": "Btrfs: fix that check_int_data mount option was ignored\n\nThe bitfield member mount_opt was too small by one bit to hold the mount\noption that enabled to include data extents in the integrity checker.\nSince the same issue happened when the BTRFS_MOUNT_PANIC_ON_FATAL_ERROR\noption was added (git rebase silently merges so that the increase of the\nsize of the bitfield member is lost), the bit limit was removed entirely.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\n" }, { "commit": "5c84fc3c3914e9adfa6155a167c6c0c2709e6a62", "tree": "b2ef30b7872dc9f31f621681169abaf4eb9e8205", "parents": [ "99ba55ad696944b37d5557bc5b4816890854fdb9" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Fri Mar 30 13:58:31 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:36 2012 +0200" }, "message": "Btrfs: don\u0027t count CRC or header errors twice while scrubbing\n\nEach CRC or header error was counted twice, this is now fixed.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\n" }, { "commit": "99ba55ad696944b37d5557bc5b4816890854fdb9", "tree": "2c8bf9a167f351b89ef86e2133ffec7dfb5d1ce7", "parents": [ "b9688bb8459b67e42327de6420edb405a9188775" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Mon Mar 19 16:17:22 2012 +0100" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:35 2012 +0200" }, "message": "Btrfs: fix btrfs_ioctl_dev_info() crash on missing device\n\nWhen a filesystem is mounted with the degraded option, it is\npossible that some of the devices are not there.\nbtrfs_ioctl_dev_info() crashs in this case because the device\nname is a NULL pointer. This ioctl was only used for scrub.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\n" }, { "commit": "b9688bb8459b67e42327de6420edb405a9188775", "tree": "90f1b5be9f4829463082e24357f5c9a5677797f3", "parents": [ "253beebd5a255e07d6a8b65515491f33664e82a2" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Wed Apr 18 10:27:16 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:33 2012 +0200" }, "message": "btrfs: don\u0027t return EINTR\n\nIt is basically a good thing if we are interruptible when waiting for\nfree space, but the generality in which it is implemented currently\nleads to system calls being interruptible that are not documented this\nway. For example git can\u0027t handle interrupted unlink(), leading to\ncorrupt repos under space pressure.\nInstead we raise the bar to only be interruptible by SIGKILL.\nThanks to David Sterba for suggesting this.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\n" }, { "commit": "253beebd5a255e07d6a8b65515491f33664e82a2", "tree": "9bc6b5f567b7683df4b2a8d46ecdc6d8dd139d1e", "parents": [ "5cf1ab56133ad7b712673c071b439d4a555a2d1e" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Apr 18 09:59:03 2012 +0300" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:31 2012 +0200" }, "message": "Btrfs: double unlock bug in error handling\n\nThe caller expects this function to return with the lock held and\nreleases it immediately on error.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\n" }, { "commit": "5cf1ab56133ad7b712673c071b439d4a555a2d1e", "tree": "c7b301296750707f47487f508398f1baec81f48b", "parents": [ "48d282326b3ce5f435835f5fb0e3231c399f4f9a" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Apr 16 09:42:26 2012 -0400" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:30 2012 +0200" }, "message": "Btrfs: always store the mirror we read the eb from\n\nA user reported a panic where we were trying to fix a bad mirror but the\nmirror number we were giving was 0, which is invalid. This is because we\ndon\u0027t do the transid verification until after the read, so as far as the\nread code is concerned the read was a success. So instead store the mirror\nwe read from so that if there is some failure post read we know which mirror\nto try next and which mirror needs to be fixed if we find a good copy of the\nblock. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "48d282326b3ce5f435835f5fb0e3231c399f4f9a", "tree": "eaac4c3c02d2168ed47ba50e41f765a32f319c61", "parents": [ "8a3db1849e9e2563727ea2dc32737502e0096641" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Sat Apr 14 11:24:33 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:28 2012 +0200" }, "message": "fs/btrfs/volumes.c: add missing free_fs_devices\n\nFree fs_devices as done in the error-handling code just below.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\n" }, { "commit": "8a3db1849e9e2563727ea2dc32737502e0096641", "tree": "378c3527b32dea43c50a3cd1cf534d7901aab4be", "parents": [ "37db63a400d3bac467795aa43901065fd8d903b7" ], "author": { "name": "Sergei Trofimovich", "email": "slyfox@gentoo.org", "time": "Mon Apr 16 06:44:37 2012 +0300" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:26 2012 +0200" }, "message": "btrfs: fix early abort in \u0027remount\u0027\n\nCc: Jeff Mahoney \u003cjeffm@suse.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Sergei Trofimovich \u003cslyfox@gentoo.org\u003e\n" }, { "commit": "37db63a400d3bac467795aa43901065fd8d903b7", "tree": "6dcafae4fa5e43bccaac3799685b1519575968a2", "parents": [ "b916a59adfdc875381b68ced258694b434cf43ae" ], "author": { "name": "Ilya Dryomov", "email": "idryomov@gmail.com", "time": "Fri Apr 13 17:05:08 2012 +0300" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:25 2012 +0200" }, "message": "Btrfs: fix max chunk size check in chunk allocator\n\nFix a bug, where in case we need to adjust stripe_size so that the\nlength of the resulting chunk is less than or equal to max_chunk_size,\nDUP chunks turn out to be only half as big as they could be.\n\nCc: Arne Jansen \u003csensille@gmx.net\u003e\nSigned-off-by: Ilya Dryomov \u003cidryomov@gmail.com\u003e\n" }, { "commit": "b916a59adfdc875381b68ced258694b434cf43ae", "tree": "7c73c9326cd558e9a5ae34381a6450e354a65a9d", "parents": [ "aefc1eb13ebbb86c5ffade8a9e2425cd71032d7e" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Fri Apr 13 12:28:08 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:23 2012 +0200" }, "message": "Btrfs: add missing read locks in backref.c\n\niref_to_path and iterate_irefs both increment the eb\u0027s refcount to use it\nafter releasing the path. Both depend on consistent data remaining in the\nextent buffer and need a read lock to protect it.\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\n" }, { "commit": "aefc1eb13ebbb86c5ffade8a9e2425cd71032d7e", "tree": "36acddddf6f4b50877b22e683704bc2cbaf4d3b5", "parents": [ "4735fb282830c0966b301dabcccf4753fa6604bb" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Fri Apr 13 12:28:00 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:21 2012 +0200" }, "message": "Btrfs: don\u0027t call free_extent_buffer twice in iterate_irefs\n\nAvoid calling free_extent_buffer more than once when the iterator function\nreturns non-zero. The only code that uses this is scrub repair for corrupted\nnodatasum blocks.\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\n" }, { "commit": "4735fb282830c0966b301dabcccf4753fa6604bb", "tree": "1749491d41f888c29dbad6de37fe3fbe81a38fc3", "parents": [ "cdc6a3952558f00b1bc3b6401e1cf98797632fe2" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Apr 12 22:47:52 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:20 2012 +0200" }, "message": "Btrfs: Make free_ipath() deal gracefully with NULL pointers\n\nMake free_ipath() behave like most other freeing functions in the\nkernel and gracefully do nothing when passed a NULL pointer.\n\nBesides this making the bahaviour consistent with functions such as\nkfree(), vfree(), btrfs_free_path() etc etc, it also fixes a real NULL\nderef issue in fs/btrfs/ioctl.c::btrfs_ioctl_ino_to_path(). In that\nfunction we have this code:\n\n...\n ipath \u003d init_ipath(size, root, path);\n if (IS_ERR(ipath)) {\n ret \u003d PTR_ERR(ipath);\n ipath \u003d NULL;\n goto out;\n }\n...\nout:\n btrfs_free_path(path);\n free_ipath(ipath);\n...\n\nIf we ever take the true branch of that \u0027if\u0027 statement we\u0027ll end up\npassing a NULL pointer to free_ipath() which will subsequently\ndereference it and we\u0027ll go \"Boom\" :-(\nThis patch will avoid that.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\n" }, { "commit": "cdc6a3952558f00b1bc3b6401e1cf98797632fe2", "tree": "b97cf714429b439c6887b2fe0acf9065e1d09f1f", "parents": [ "8e52acf70459020d7e9e9fda25066be4da520943" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Mar 12 16:39:48 2012 +0800" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:18 2012 +0200" }, "message": "Btrfs: avoid possible use-after-free in clear_extent_bit()\n\nclear_extent_bit()\n{\n next_node \u003d rb_next(\u0026state-\u003erb_node);\n ...\n clear_state_bit(state); \u003c-- this may free next_node\n if (next_node) {\n state \u003d rb_entry(next_node);\n ...\n }\n}\n\nclear_state_bit() calls merge_state() which may free the next node\nof the passing extent_state, so clear_extent_bit() may end up\nreferencing freed memory.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "8e52acf70459020d7e9e9fda25066be4da520943", "tree": "f6c63a909414958b3a8155fa83b17ea1c3c10525", "parents": [ "871383be592ba7e819d27556591e315a0df38cee" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Mar 12 16:39:28 2012 +0800" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:16 2012 +0200" }, "message": "Btrfs: retrurn void from clear_state_bit\n\nCurrently it returns a set of bits that were cleared, but this return\nvalue is not used at all.\n\nMoreover it doesn\u0027t seem to be useful, because we may clear the bits\nof a few extent_states, but only the cleared bits of last one is\nreturned.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "871383be592ba7e819d27556591e315a0df38cee", "tree": "0f0c2bc7ecf2d70a5ffa842001d70b5b0f8958d0", "parents": [ "8d082fb727ac11930ea20bf1612e334ea7c2b697" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Mon Apr 02 18:31:37 2012 +0200" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:14 2012 +0200" }, "message": "btrfs: add missing unlocks to transaction abort paths\n\nAdded in commit 49b25e0540904be0bf558b84475c69d72e4de66e\n(\"btrfs: enhance transaction abort infrastructure\")\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\n" }, { "commit": "8d082fb727ac11930ea20bf1612e334ea7c2b697", "tree": "417f84a4e3743bf0af435e0e339ef3fc54520a68", "parents": [ "207a232ccac0a8cb79d304bd17298dbc96e2e082" ], "author": { "name": "Liu Bo", "email": "liubo2009@cn.fujitsu.com", "time": "Tue Apr 03 09:56:53 2012 +0800" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:22:13 2012 +0200" }, "message": "Btrfs: do not mount when we have a sectorsize unequal to PAGE_SIZE\n\nOur code is not ready to cope with a sectorsize that\u0027s not equal to PAGE_SIZE.\nIt will lead to hanging-on while writing something.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\n" }, { "commit": "207a232ccac0a8cb79d304bd17298dbc96e2e082", "tree": "baed843e078e80d04ff28054751dea22e98bea0b", "parents": [ "8c9c2bf7a3c4f7e9d158c0be9c49f372fb943ad2" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Sat Feb 25 09:09:47 2012 +0100" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:12:44 2012 +0200" }, "message": "btrfs: don\u0027t add both copies of DUP to reada extent tree\n\nNormally when there are 2 copies of a block, we add both to the\nreada extent tree and prefetch only the one that is easier to reach.\nThis way we can better utilize multiple devices.\nIn case of DUP this makes no sense as both copies reside on the\nsame device.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\n" }, { "commit": "8c9c2bf7a3c4f7e9d158c0be9c49f372fb943ad2", "tree": "6c17b4db9b39cb8eb950c21377f453df18f467c3", "parents": [ "848cce0d4102b5b4b26b0987b43e1919d462afe2" ], "author": { "name": "Arne Jansen", "email": "sensille@gmx.net", "time": "Sat Feb 25 09:09:30 2012 +0100" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:12:44 2012 +0200" }, "message": "btrfs: fix race in reada\n\nWhen inserting into the radix tree returns EEXIST, get the existing\nentry without giving up the spinlock in between.\nThere was a race for both the zones trees and the extent tree.\n\nSigned-off-by: Arne Jansen \u003csensille@gmx.net\u003e\n" }, { "commit": "848cce0d4102b5b4b26b0987b43e1919d462afe2", "tree": "92f2be7324929c9b213c1fcd616b11cc1a479d20", "parents": [ "d53ba47484ed6245e640ee4bfe9d21e9bfc15765" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Tue Feb 21 17:04:28 2012 +0800" }, "committer": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Wed Apr 18 19:12:44 2012 +0200" }, "message": "Btrfs: avoid setting -\u003ed_op twice\n\nFollow those instructions, and you\u0027ll trigger a warning in the\nbeginning of d_set_d_op():\n\n # mkfs.btrfs /dev/loop3\n # mount /dev/loop3 /mnt\n # btrfs sub create /mnt/sub\n # btrfs sub snap /mnt /mnt/snap\n # touch /mnt/snap/sub\n touch: cannot touch `tmp\u0027: Permission denied\n\n__d_alloc() set d_op to sb-\u003es_d_op (btrfs_dentry_operations), and\nthen simple_lookup() reset it to simple_dentry_operations, which\ntriggered the warning.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "ca138f368a36dba40d3ef4a53d64af2011cda3c7", "tree": "542ffcce3992273475946a3c5a60155630320ca6", "parents": [ "adae0fe0ea87e8fb1a72dde304937c60759b495f" ], "author": { "name": "Fred Isaman", "email": "iisaman@netapp.com", "time": "Thu Apr 05 15:26:36 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 11:05:49 2012 -0400" }, "message": "NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n\nSigned-off-by: Fred Isaman \u003ciisaman@netapp.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "592fe8980688e7cba46897685d014c7fb3018a67", "tree": "da0df053994838535a6d260eaacf32c84e2619ef", "parents": [ "d44c6d4fa9b3d9b4f6d8d1751d9cbc50ed53cffe", "57f73c2c89a5d3b2ed87201c8100d1fa989a1a65" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 17 13:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 17 13:30:34 2012 -0700" }, "message": "Merge tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\nPull ext4 regression fixes from Ted Ts\u0027o:\n \"This fixes a scalability problem reported by Andi Kleen and Tim Chen;\n they were quite secretive about the precise nature of their workload,\n but they later admitted that it only showed up when they were using a\n large sparse file, so the amount of data I/O that was needed was close\n to zero.\n\n I\u0027m not sure how realistic this is and it\u0027s only a regression if you\n consider changes made since 2.6.39 to be a \"regression\" vis-a-vis the\n policy regarding post-merge window bug fixes, but Linus agreed it was\n worth fixing, so I\u0027m including it in this pull request.\n\n This also fixes the journalled quota mount options, which I\n accidentally broke while I was cleaning up the mount option handling.\"\n\n* tag \u0027ext4_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n ext4: fix handling of journalled quota options\n ext4: address scalability issue by removing extent cache statistics\n" } ], "next": "d44c6d4fa9b3d9b4f6d8d1751d9cbc50ed53cffe" }