)]}' { "log": [ { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "696ac96c2757963cd6751c26215e3c6d328705aa", "tree": "e6cfc456e6c4a7d6de9df7880e807a957a226009", "parents": [ "4e29d50a28c267bd1d1731a9fb8f773663d93e23" ], "author": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Mon Jul 05 15:15:02 2010 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 09 16:48:55 2010 -0400" }, "message": "btrfs: remove junk sb_dirt change\n\nBTRFS does not define a \u0027-\u003ewrite_super()\u0027 method, so it should\nnot mark its superblock as dirty. This looks like some left-over.\n\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nAcked-by: Chris Mason \u003cchris.mason@oracle.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "45321ac54316eaeeebde0b5f728a1791e500974c", "tree": "c3989dd1a8b4a50168d696aa608941de88da9ade", "parents": [ "30140837f256558c943636245ab90897a9455a70" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 07 13:43:19 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 09 16:48:35 2010 -0400" }, "message": "Make -\u003edrop_inode() just return whether inode needs to be dropped\n\n... and let iput_final() do the actual eviction or retention\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bd55597520a2eaa0d71dd7683513a14bfd1bdf5c", "tree": "b99685fe2d9b6c9ad87b7d3e6a8fc47a5ac248ce", "parents": [ "d5c1515cf374951f07e5bf97b6ff3718d3401b6f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 07 11:35:40 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 09 16:48:22 2010 -0400" }, "message": "convert btrfs to -\u003eevict_inode()\n\nNB: do we want btrfs_wait_ordered_range() on eviction of\ninodes with positive i_nlink on subvolume with zero root_refs?\nIf not, btrfs_evict_inode() can be simplified by unconditionally\nbailing out in case of i_nlink \u003e 0 in the very beginning...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a4ffdde6e56fdf8c34ddadc2674d6eb978083369", "tree": "0fa07df92d804cb7d0482135195e4835cb16403a", "parents": [ "b5fc510c48f631882ccec3c0f02a25d5b67de09f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jun 02 17:38:30 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 09 16:47:44 2010 -0400" }, "message": "simplify checks for I_CLEAR/I_FREEING\n\nadd I_CLEAR instead of replacing I_FREEING with it. I_CLEAR is\nequivalent to I_FREEING for almost all code looking at either;\nit\u0027s there to keep track of having called clear_inode() exactly\nonce per inode lifetime, at some point after having set I_FREEING.\nI_CLEAR and I_FREEING never get set at the same time with the\ncurrent code, so we can switch to setting i_flags to I_FREEING | I_CLEAR\ninstead of I_CLEAR without loss of information. As the result of\nsuch change, checks become simpler and the amount of code that needs\nto know about I_CLEAR shrinks a lot.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1025774ce411f2bd4b059ad7b53f0003569b74fa", "tree": "2be221c205cb5579652a6063e8ee27d1c72d1bbd", "parents": [ "eef2380c187890816b73b1a4cb89a09203759469" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Fri Jun 04 11:30:02 2010 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Aug 09 16:47:37 2010 -0400" }, "message": "remove inode_setattr\n\nReplace inode_setattr with opencoded variants of it in all callers. This\nmoves the remaining call to vmtruncate into the filesystem methods where it\ncan be replaced with the proper truncate sequence.\n\nIn a few cases it was obvious that we would never end up calling vmtruncate\nso it was left out in the opencoded variant:\n\n spufs: explicitly checks for ATTR_SIZE earlier\n btrfs,hugetlbfs,logfs,dlmfs: explicitly clears ATTR_SIZE earlier\n ufs: contains an opencoded simple_seattr + truncate that sets the filesize just above\n\nIn addition to that ncpfs called inode_setattr with handcrafted iattrs,\nwhich allowed to trim down the opencoded variant.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "7b6d91daee5cac6402186ff224c3af39d79f4a0e", "tree": "b1518cf0b6c301178e0a320f80610cd5b3aa7625", "parents": [ "33659ebbae262228eef4e0fe990f393d1f0ed941" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Aug 07 18:20:39 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:20:39 2010 +0200" }, "message": "block: unify flags for struct bio and struct request\n\nRemove the current bio flags and reuse the request flags for the bio, too.\nThis allows to more easily trace the type of I/O from the filesystem\ndown to the block driver. There were two flags in the bio that were\nmissing in the requests: BIO_RW_UNPLUG and BIO_RW_AHEAD. Also I\u0027ve\nrenamed two request flags that had a superflous RW in them.\n\nNote that the flags are in bio.h despite having the REQ_ name - as\nblkdev.h includes bio.h that is the only way to go for now.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "ee1039307a8a64b038f9b8cdc6f9120ecd9dfe9b", "tree": "05d4bb91752fdb1652a93bcd2ad4514cc697c2df", "parents": [ "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4", "2ebc3464781ad24474abcbd2274e6254689853b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 19:33:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 19:33:02 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE\n Btrfs: fix CLONE ioctl destination file size expansion to block boundary\n Btrfs: fix split_leaf double split corner case\n" }, { "commit": "2ebc3464781ad24474abcbd2274e6254689853b5", "tree": "3d58dfcc14948672c0aac1636cdd57cbe46a135d", "parents": [ "b5384d48f4e74edec3ca1887cb65e378a72af9a1" ], "author": { "name": "Dan Rosenberg", "email": "dan.j.rosenberg@gmail.com", "time": "Mon Jul 19 16:58:20 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Jul 19 16:58:20 2010 -0400" }, "message": "Btrfs: fix checks in BTRFS_IOC_CLONE_RANGE\n\n1. The BTRFS_IOC_CLONE and BTRFS_IOC_CLONE_RANGE ioctls should check\nwhether the donor file is append-only before writing to it.\n\n2. The BTRFS_IOC_CLONE_RANGE ioctl appears to have an integer\noverflow that allows a user to specify an out-of-bounds range to copy\nfrom the source file (if off + len wraps around). I haven\u0027t been able\nto successfully exploit this, but I\u0027d imagine that a clever attacker\ncould use this to read things he shouldn\u0027t. Even if it\u0027s not\nexploitable, it couldn\u0027t hurt to be safe.\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\ncc: stable@kernel.org\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b5384d48f4e74edec3ca1887cb65e378a72af9a1", "tree": "cf41ab7d6a2c2606abe465c8229f002675696de0", "parents": [ "99d8f83c98930100cd70437b0c81a935e7a14b0b" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Sat Jun 12 22:31:14 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Jul 19 16:15:06 2010 -0400" }, "message": "Btrfs: fix CLONE ioctl destination file size expansion to block boundary\n\nThe CLONE and CLONE_RANGE ioctls round up the range of extents being\ncloned to the block size when the range to clone extends to the end of file\n(this is always the case with CLONE). It was then using that offset when\nextending the destination file\u0027s i_size. Fix this by not setting i_size\nbeyond the originally requested ending offset.\n\nThis bug was introduced by a22285a6 (2.6.35-rc1).\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "99d8f83c98930100cd70437b0c81a935e7a14b0b", "tree": "db4ea3e51c5cc33b903c498368dc7b14e2a07125", "parents": [ "6f902af400b2499c80865c62a06fbbd15cf804fd" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed Jul 07 10:51:48 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Jul 19 16:14:50 2010 -0400" }, "message": "Btrfs: fix split_leaf double split corner case\n\nsplit_leaf was not properly balancing leaves when it was forced to\nsplit a leaf twice. This commit adds an extra push left and right\nbefore forcing the double split in hopes of getting the slot where\nwe want to insert at either the start or end of the leaf.\n\nIf the extra pushes do work, then we are able to avoid splitting twice\nand we keep the tree properly balanced.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c", "tree": "fa131760a61f66afeede852622ede0d716965489", "parents": [ "06d738fa9155ff16dba3d7e501ba4581d01a98cb" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jun 10 12:07:27 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 06 08:54:03 2010 +0200" }, "message": "writeback: remove writeback_inodes_wbc\n\nThis was just an odd wrapper around writeback_inodes_wb. Removing this\nalso allows to get rid of the bdi member of struct writeback_control\nwhich was rather out of place there.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "b25b550bb153626df6a48eb8583e923e3dfcf64a", "tree": "baca9843877b8b3a254cde92ac2a9072014b5621", "parents": [ "eda054770e5cd0e9ee1568dfcbcf39f9ade4f545", "6f902af400b2499c80865c62a06fbbd15cf804fd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:18:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:18:47 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: The file argument for fsync() is never null\n Btrfs: handle ERR_PTR from posix_acl_from_xattr()\n Btrfs: avoid BUG when dropping root and reference in same transaction\n Btrfs: prohibit a operation of changing acl\u0027s mask when noacl mount option used\n Btrfs: should add a permission check for setfacl\n Btrfs: btrfs_lookup_dir_item() can return ERR_PTR\n Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs\n Btrfs: unwind after btrfs_start_transaction() errors\n Btrfs: btrfs_iget() returns ERR_PTR\n Btrfs: handle kzalloc() failure in open_ctree()\n Btrfs: handle error returns from btrfs_lookup_dir_item()\n Btrfs: Fix BUG_ON for fs converted from extN\n Btrfs: Fix null dereference in relocation.c\n Btrfs: fix remap_file_pages error\n Btrfs: uninitialized data is check_path_shared()\n Btrfs: fix fallocate regression\n Btrfs: fix loop device on top of btrfs\n" }, { "commit": "6f902af400b2499c80865c62a06fbbd15cf804fd", "tree": "9bd7ee1dd243b5513ebad74b2870950a6d427d3c", "parents": [ "834e74759a473f8101a273e843d1edec2778801d" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:49:07 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:40 2010 -0400" }, "message": "Btrfs: The file argument for fsync() is never null\n\nThe \"file\" argument for fsync is never null so we can remove this check.\n\nWhat drew my attention here is that 7ea8085910e: \"drop unused dentry\nargument to -\u003efsync\" introduced an unconditional dereference at the\nstart of the function and that generated a smatch warning.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "834e74759a473f8101a273e843d1edec2778801d", "tree": "f7009149bb1ca362737b2e6b7dc855326d90f079", "parents": [ "15e7000095e6fc9ad07e476a100c900c72c14225" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:48:35 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:39 2010 -0400" }, "message": "Btrfs: handle ERR_PTR from posix_acl_from_xattr()\n\nposix_acl_from_xattr() returns both ERR_PTRs and null, but it\u0027s OK to\npass null values to set_cached_acl()\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "15e7000095e6fc9ad07e476a100c900c72c14225", "tree": "c97fa27a7727c82d78d43ac0b1df63a4f9954cfa", "parents": [ "731e3d1b4348a96d53de6c084774424dedc64a3b" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon May 17 17:15:27 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:39 2010 -0400" }, "message": "Btrfs: avoid BUG when dropping root and reference in same transaction\n\nIf btrfs_ioctl_snap_destroy() deletes a snapshot but finishes\nwith end_transaction(), the cleaner kthread may come in and\ndrop the root in the same transaction. If that\u0027s the case, the\nroot\u0027s refs still \u003d\u003d 1 in the tree when btrfs_del_root() deletes\nthe item, because commit_fs_roots() hasn\u0027t updated it yet (that\nhappens during the commit).\n\nThis wasn\u0027t a problem before only because\nbtrfs_ioctl_snap_destroy() would commit the transaction before dropping\nthe dentry reference, so the dead root wouldn\u0027t get queued up until\nafter the fs root item was updated in the btree.\n\nSince it is not an error to drop the root reference and the root in the\nsame transaction, just drop the BUG_ON() in btrfs_del_root().\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "731e3d1b4348a96d53de6c084774424dedc64a3b", "tree": "1f0a95894fa9a8e226ee2d74c64805c373b1b927", "parents": [ "2f26afba46f0ebf155cf9be746496a0304a5b7cf" ], "author": { "name": "Shi Weihua", "email": "shiwh@cn.fujitsu.com", "time": "Tue May 18 00:51:54 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:38 2010 -0400" }, "message": "Btrfs: prohibit a operation of changing acl\u0027s mask when noacl mount option used\n\nwhen used Posix File System Test Suite(pjd-fstest) to test btrfs,\nsome cases about setfacl failed when noacl mount option used.\nI simplified used commands in pjd-fstest, and the following steps\ncan reproduce it.\n------------------------\n# cd btrfs-part/\n# mkdir aaa\n# setfacl -m m::rw aaa \u003c- successed, but not expected by pjd-fstest.\n------------------------\nI checked ext3, a warning message occured, like as:\n setfacl: aaa/: Operation not supported\nCertainly, it\u0027s expected by pjd-fstest.\n\nSo, i compared acl.c of btrfs and ext3. Based on that, a patch created.\nFortunately, it works.\n\nSigned-off-by: Shi Weihua \u003cshiwh@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2f26afba46f0ebf155cf9be746496a0304a5b7cf", "tree": "8127a4a101734efce3c0d0190754f180de05a599", "parents": [ "cf1e99a4e0daa4a5623cd71108509823b9ff2d30" ], "author": { "name": "Shi Weihua", "email": "shiwh@cn.fujitsu.com", "time": "Tue May 18 00:50:32 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:37 2010 -0400" }, "message": "Btrfs: should add a permission check for setfacl\n\nOn btrfs, do the following\n------------------\n# su user1\n# cd btrfs-part/\n# touch aaa\n# getfacl aaa\n # file: aaa\n # owner: user1\n # group: user1\n user::rw-\n group::rw-\n other::r--\n# su user2\n# cd btrfs-part/\n# setfacl -m u::rwx aaa\n# getfacl aaa\n # file: aaa\n # owner: user1\n # group: user1\n user::rwx \u003c- successed to setfacl\n group::rw-\n other::r--\n------------------\nbut we should prohibit it that user2 changing user1\u0027s acl.\nIn fact, on ext3 and other fs, a message occurs:\n setfacl: aaa: Operation not permitted\n\nThis patch fixed it.\nSigned-off-by: Shi Weihua \u003cshiwh@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "cf1e99a4e0daa4a5623cd71108509823b9ff2d30", "tree": "e2e613940e9d4449be976a5a09e1c2a72bb45a83", "parents": [ "3140c9a34b44cd4013baae8704fdb34a93a44475" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:47:24 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:37 2010 -0400" }, "message": "Btrfs: btrfs_lookup_dir_item() can return ERR_PTR\n\nbtrfs_lookup_dir_item() can return either ERR_PTRs or null.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3140c9a34b44cd4013baae8704fdb34a93a44475", "tree": "824a5ecb5d6d1c50769d96cd48b8394c009334d5", "parents": [ "d327099a23e3d0c8ec09137e9b4b115449d4eb29" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:44:10 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:36 2010 -0400" }, "message": "Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs\n\nbtrfs_read_fs_root_no_name() returns ERR_PTRs on error so I added a\ncheck for that. It\u0027s not clear to me if it can also return NULL\npointers or not so I left the original NULL pointer check as is.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d327099a23e3d0c8ec09137e9b4b115449d4eb29", "tree": "beeb39af28a863e3e0d9e40ea3f1af5e5d05cc96", "parents": [ "4cbd1149fbcc351bdf08ab749867d157905d0d35" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:46:47 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:35 2010 -0400" }, "message": "Btrfs: unwind after btrfs_start_transaction() errors\n\nThis was added by a22285a6a3: \"Btrfs: Integrate metadata reservation\nwith start_transaction\". If we goto out here then we skip all the\nunwinding and there are locks still held etc.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4cbd1149fbcc351bdf08ab749867d157905d0d35", "tree": "7acb025997c961e594116596a135d023361ee603", "parents": [ "676e4c86391936795c82ccd11ca9671ee6307936" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:42:19 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:35 2010 -0400" }, "message": "Btrfs: btrfs_iget() returns ERR_PTR\n\nbtrfs_iget() returns an ERR_PTR() on failure and not null.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "676e4c86391936795c82ccd11ca9671ee6307936", "tree": "b39173542a91c008d54d1acf6463b874793accee", "parents": [ "fb4f6f910ca6f58564c31a680ef88940d8192713" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:43:07 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:34 2010 -0400" }, "message": "Btrfs: handle kzalloc() failure in open_ctree()\n\nUnwind and return -ENOMEM if the allocation fails here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "fb4f6f910ca6f58564c31a680ef88940d8192713", "tree": "ee83845c90ac3ec395ac670c7d87c83b0486de83", "parents": [ "3bf84a5a834d13e7c5c3e8e5b5c6b26012118dd8" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat May 29 09:40:57 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:57:33 2010 -0400" }, "message": "Btrfs: handle error returns from btrfs_lookup_dir_item()\n\nIf btrfs_lookup_dir_item() fails, we should can just let the mount fail\nwith an error.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3bf84a5a834d13e7c5c3e8e5b5c6b26012118dd8", "tree": "7cc6e70cb2cc175163472141b1ca2dfc4c72eddd", "parents": [ "046f264f6b3b2cf7e5a1769fc92335d8a9316282" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Mon May 31 09:04:46 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:48:35 2010 -0400" }, "message": "Btrfs: Fix BUG_ON for fs converted from extN\n\nTree blocks can live in data block groups in FS converted from extN.\nSo it\u0027s easy to trigger the BUG_ON.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "046f264f6b3b2cf7e5a1769fc92335d8a9316282", "tree": "d057bb90894e20fcdab6ec737d5f11a040c6d9d0", "parents": [ "058a457ef0ce28d595af53d6103db73332383cbc" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Mon May 31 08:58:47 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 15:48:34 2010 -0400" }, "message": "Btrfs: Fix null dereference in relocation.c\n\nFix a potential null dereference in relocation.c\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nAcked-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "058a457ef0ce28d595af53d6103db73332383cbc", "tree": "7f17117d57c90839cd6d50e588cba0bca97a0de6", "parents": [ "0e4dcbef1c0c3e29f9c7f824359445d385b2649a" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Thu May 20 07:21:50 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 11:46:12 2010 -0400" }, "message": "Btrfs: fix remap_file_pages error\n\nwhen we use remap_file_pages() to remap a file, remap_file_pages always return\nerror. It is because btrfs didn\u0027t set VM_CAN_NONLINEAR for vma.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0e4dcbef1c0c3e29f9c7f824359445d385b2649a", "tree": "cb360bec033ae7bbf237aedd84528c83f2715d47", "parents": [ "836097797236fd727f82ec2f3f376ac41a430876" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue Jun 01 08:23:11 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 11:46:12 2010 -0400" }, "message": "Btrfs: uninitialized data is check_path_shared()\n\nrefs can be used with uninitialized data if btrfs_lookup_extent_info()\nfails on the first pass through the loop. In the original code if that\nhappens then check_path_shared() probably returns 1, this patch\nchanges it to return 1 for safety.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "836097797236fd727f82ec2f3f376ac41a430876", "tree": "72481501a21cfa6494e0b9bba89e3a8f783e2074", "parents": [ "4a001071d3549f596c7c3736c5dda8a3a4aba9ed" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jun 07 18:26:37 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 11:46:12 2010 -0400" }, "message": "Btrfs: fix fallocate regression\n\nSeems that when btrfs_fallocate was converted to use the new ENOSPC stuff we\ndropped passing the mode to the function that actually does the preallocation.\nThis breaks anybody who wants to use FALLOC_FL_KEEP_SIZE. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4a001071d3549f596c7c3736c5dda8a3a4aba9ed", "tree": "f835cbd0779a8912aa65669bbd44ce3f756c919f", "parents": [ "9aeead73782c4b8e2a91def36dbf95db28605c95" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Mon Jun 07 03:38:51 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jun 11 11:46:11 2010 -0400" }, "message": "Btrfs: fix loop device on top of btrfs\n\nWe cannot use the loop device which has been connected to a file in the btrf\n\nThe reproduce steps is following:\n # dd if\u003d/dev/zero of\u003dvdev0 bs\u003d1M count\u003d1024\n # losetup /dev/loop0 vdev0\n # mkfs.btrfs /dev/loop0\n ...\n failed to zero device start -5\n\nThe reason is that the btrfs don\u0027t implement either -\u003ewrite_begin or -\u003ewrite\nthe VFS API, so we fix it by setting -\u003ewrite to do_sync_write().\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7ea8085910ef3dd4f3cad6845aaa2b580d39b115", "tree": "d9c1edb5906f943f7d70bfb4b65106e29772d379", "parents": [ "cc967be54710d97c05229b2e5ba2d00df84ddd64" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed May 26 17:53:25 2010 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu May 27 22:05:02 2010 -0400" }, "message": "drop unused dentry argument to -\u003efsync\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "105a048a4f35f7a74c7cc20b36dd83658b6ec232", "tree": "043b1110cda0042ba35d8aae59382bb094d0af3f", "parents": [ "00b9b0af5887fed54e899e3b7f5c2ccf5e739def", "9aeead73782c4b8e2a91def36dbf95db28605c95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:43:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 10:43:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (27 commits)\n Btrfs: add more error checking to btrfs_dirty_inode\n Btrfs: allow unaligned DIO\n Btrfs: drop verbose enospc printk\n Btrfs: Fix block generation verification race\n Btrfs: fix preallocation and nodatacow checks in O_DIRECT\n Btrfs: avoid ENOSPC errors in btrfs_dirty_inode\n Btrfs: move O_DIRECT space reservation to btrfs_direct_IO\n Btrfs: rework O_DIRECT enospc handling\n Btrfs: use async helpers for DIO write checksumming\n Btrfs: don\u0027t walk around with task-\u003estate !\u003d TASK_RUNNING\n Btrfs: do aio_write instead of write\n Btrfs: add basic DIO read/write support\n direct-io: do not merge logically non-contiguous requests\n direct-io: add a hook for the fs to provide its own submit_bio function\n fs: allow short direct-io reads to be completed via buffered IO\n Btrfs: Metadata ENOSPC handling for balance\n Btrfs: Pre-allocate space for data relocation\n Btrfs: Metadata ENOSPC handling for tree log\n Btrfs: Metadata reservation for orphan inodes\n Btrfs: Introduce global metadata reservation\n ...\n" }, { "commit": "9aeead73782c4b8e2a91def36dbf95db28605c95", "tree": "7dc2cc6f382ec72715c87ac17ff20e7c0649e4b8", "parents": [ "5a5f79b57069c5691f5b6fd8381fdf487f548ae5" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu May 27 10:23:00 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu May 27 10:23:00 2010 -0400" }, "message": "Btrfs: add more error checking to btrfs_dirty_inode\n\nThe ENOSPC code will now return ENOSPC to btrfs_start_transaction.\nbtrfs_dirty_inode needs to check for this and error out appropriately.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5a5f79b57069c5691f5b6fd8381fdf487f548ae5", "tree": "d101b4025a2b23c5e258b04714907f4266c3b2df", "parents": [ "933b585f70d524f1b6f0f6867bedb11d3dd82d3b" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 21:33:37 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 21:35:35 2010 -0400" }, "message": "Btrfs: allow unaligned DIO\n\nIn order to support DIO that isn\u0027t aligned to the filesystem blocksize,\nwe fall back to buffered for any unaligned DIOs.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "933b585f70d524f1b6f0f6867bedb11d3dd82d3b", "tree": "f871988129967de5dabb20ae612ea7c22cc4c770", "parents": [ "5bdd3536cbbe2ecd94ecc14410c6b1b31da16381" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 11:31:00 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 21:35:34 2010 -0400" }, "message": "Btrfs: drop verbose enospc printk\n\nLess printk is good printk.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5bdd3536cbbe2ecd94ecc14410c6b1b31da16381", "tree": "7fd9cd2cb497f6150a5dfde4528ba6ba64144e40", "parents": [ "46bfbb5c0740c200d2b66afcbd1f9d64ab320940" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Wed May 26 11:20:30 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 21:35:33 2010 -0400" }, "message": "Btrfs: Fix block generation verification race\n\nAfter the path is released, the generation number got from block\npointer is no long valid. The race may cause disk corruption, because\nverify_parent_transid() calls clear_extent_buffer_uptodate() when\ngeneration numbers mismatch.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "46bfbb5c0740c200d2b66afcbd1f9d64ab320940", "tree": "3ec1523f7da103a79f71fc5f486596307a4eeb54", "parents": [ "94b604429a6cd94ddc128fa2772c57209bb1318f" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 11:04:10 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 21:34:45 2010 -0400" }, "message": "Btrfs: fix preallocation and nodatacow checks in O_DIRECT\n\nThe O_DIRECT code wasn\u0027t checking for multiple references\non preallocated or nodatacow extents. This means it\nwasn\u0027t honoring snapshots properly.\n\nThe fix here is to add an explicit check for multiple references\nThis also fixes the math for selecting the correct disk block,\nmaking sure not to go past the end of the extent.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "94b604429a6cd94ddc128fa2772c57209bb1318f", "tree": "700c5b9cb431bde48f07813224e6a5165a9d6540", "parents": [ "3f7c579c41a3d20af76fd6ff1f6b949edf105fd1" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 11:02:00 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 11:02:00 2010 -0400" }, "message": "Btrfs: avoid ENOSPC errors in btrfs_dirty_inode\n\nbtrfs_dirty_inode tries to sneak in without much waiting or\nspace reservation, mostly for performance reasons. This\nusually works well but can cause problems when there are\nmany many writers.\n\nWhen btrfs_update_inode fails with ENOSPC, we fallback\nto a slower btrfs_start_transaction call that will reserve\nsome space.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3f7c579c41a3d20af76fd6ff1f6b949edf105fd1", "tree": "374d50346763fb37299f5de93f48901596f21e59", "parents": [ "4845e44ffdb26be9b25610664228e8ecaf949a0d" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 10:59:53 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed May 26 10:59:53 2010 -0400" }, "message": "Btrfs: move O_DIRECT space reservation to btrfs_direct_IO\n\nThis moves the delalloc space reservation done for O_DIRECT\ninto btrfs_direct_IO. This way we don\u0027t leak reserved space\nif the generic O_DIRECT write code errors out before it\ncalls into btrfs_direct_IO.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4845e44ffdb26be9b25610664228e8ecaf949a0d", "tree": "8852e175b6b02a36df6b47c54d574f3365ddb34f", "parents": [ "eaf25d933e64c2bf3c79b83e8820404f36fdfc52" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 20:56:50 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 21:52:08 2010 -0400" }, "message": "Btrfs: rework O_DIRECT enospc handling\n\nThis changes O_DIRECT write code to mark extents as delalloc\nwhile it is processing them. Yan Zheng has reworked the\nenospc accounting based on tracking delalloc extents and\nthis makes it much easier to track enospc in the O_DIRECT code.\n\nThere are a few space cases with the O_DIRECT code though,\nit only sets the EXTENT_DELALLOC bits, instead of doing\nEXTENT_DELALLOC | EXTENT_DIRTY | EXTENT_UPTODATE, because\nwe don\u0027t want to mess with clearing the dirty and uptodate\nbits when things go wrong. This is important because there\nare no pages in the page cache, so any extent state structs\nthat we put in the tree won\u0027t get freed by releasepage. We have\nto clear them ourselves as the DIO ends.\n\nWith this commit, we reserve space at in btrfs_file_aio_write,\nand then as each btrfs_direct_IO call progresses it sets\nEXTENT_DELALLOC on the range.\n\nbtrfs_get_blocks_direct is responsible for clearing the delalloc\nat the same time it drops the extent lock.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "578454ff7eab61d13a26b568f99a89a2c9edc881", "tree": "6abdaf9acdd797767c92cb53e04574d3c755779e", "parents": [ "ec96e2fe954c23a54bfdf2673437a39e193a1822" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Thu May 20 18:07:20 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 25 15:08:26 2010 -0700" }, "message": "driver core: add devname module aliases to allow module on-demand auto-loading\n\nThis adds:\n alias: devname:\u003cname\u003e\nto some common kernel modules, which will allow the on-demand loading\nof the kernel module when the device node is accessed.\n\nIdeally all these modules would be compiled-in, but distros seems too\nmuch in love with their modularization that we need to cover the common\ncases with this new facility. It will allow us to remove a bunch of pretty\nuseless init scripts and modprobes from init scripts.\n\nThe static device node aliases will be carried in the module itself. The\nprogram depmod will extract this information to a file in the module directory:\n $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname\n # Device nodes to trigger on-demand module loading.\n microcode cpu/microcode c10:184\n fuse fuse c10:229\n ppp_generic ppp c108:0\n tun net/tun c10:200\n dm_mod mapper/control c10:235\n\nUdev will pick up the depmod created file on startup and create all the\nstatic device nodes which the kernel modules specify, so that these modules\nget automatically loaded when the device node is accessed:\n $ /sbin/udevd --debug\n ...\n static_dev_create_from_modules: mknod \u0027/dev/cpu/microcode\u0027 c10:184\n static_dev_create_from_modules: mknod \u0027/dev/fuse\u0027 c10:229\n static_dev_create_from_modules: mknod \u0027/dev/ppp\u0027 c108:0\n static_dev_create_from_modules: mknod \u0027/dev/net/tun\u0027 c10:200\n static_dev_create_from_modules: mknod \u0027/dev/mapper/control\u0027 c10:235\n udev_rules_apply_static_dev_perms: chmod \u0027/dev/net/tun\u0027 0666\n udev_rules_apply_static_dev_perms: chmod \u0027/dev/fuse\u0027 0666\n\nA few device nodes are switched to statically allocated numbers, to allow\nthe static nodes to work. This might also useful for systems which still run\na plain static /dev, which is completely unsafe to use with any dynamic minor\nnumbers.\n\nNote:\nThe devname aliases must be limited to the *common* and *single*instance*\ndevice nodes, like the misc devices, and never be used for conceptually limited\nsystems like the loop devices, which should rather get fixed properly and get a\ncontrol node for losetup to talk to, instead of creating a random number of\ndevice nodes in advance, regardless if they are ever used.\n\nThis facility is to hide the mess distros are creating with too modualized\nkernels, and just to hide that these modules are not compiled-in, and not to\npaper-over broken concepts. Thanks! :)\n\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Miklos Szeredi \u003cmiklos@szeredi.hu\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Alasdair G Kergon \u003cagk@redhat.com\u003e\nCc: Tigran Aivazian \u003ctigran@aivazian.fsnet.co.uk\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nSigned-Off-By: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "eaf25d933e64c2bf3c79b83e8820404f36fdfc52", "tree": "649dc862fcc9a243bdc925db34da618b25a275fc", "parents": [ "ed3b3d314cd2f16fac42676839854a68cab2e22b" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 09:48:28 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:58 2010 -0400" }, "message": "Btrfs: use async helpers for DIO write checksumming\n\nThe async helper threads offload crc work onto all the\nCPUs, and make streaming writes much faster. This\nchanges the O_DIRECT write code to use them. The only\nsmall complication was that we need to pass in the\nlogical offset in the file for each bio, because we can\u0027t\nfind it in the bio\u0027s pages.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "ed3b3d314cd2f16fac42676839854a68cab2e22b", "tree": "a38462cdfbaa0dce3bbd26fe7167fe7368439a47", "parents": [ "11c65dccf70be9ace5dbd3906778e1a099b1fee1" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:12:41 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:58 2010 -0400" }, "message": "Btrfs: don\u0027t walk around with task-\u003estate !\u003d TASK_RUNNING\n\nYan Zheng noticed two places we were doing a lot of work\nwithout task-\u003estate set to TASK_RUNNING. This sets the state\nproperly after we get ready to sleep but decide not to.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "11c65dccf70be9ace5dbd3906778e1a099b1fee1", "tree": "1289f139ddf652e39672374b6f9051994c21ce57", "parents": [ "4b46fce23349bfca781a32e2707a18328ca5ae22" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Sun May 23 11:07:21 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:57 2010 -0400" }, "message": "Btrfs: do aio_write instead of write\n\nIn order for AIO to work, we need to implement aio_write. This patch converts\nour btrfs_file_write to btrfs_aio_write. I\u0027ve tested this with xfstests and\nnothing broke, and the AIO stuff magically started working. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4b46fce23349bfca781a32e2707a18328ca5ae22", "tree": "68f1200f2bc82d3f35218aef38e6d5d92bff4aca", "parents": [ "c2c6ca417e2db7a519e6e92c82f4a933d940d076" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Sun May 23 11:00:55 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:57 2010 -0400" }, "message": "Btrfs: add basic DIO read/write support\n\nThis provides basic DIO support for reading and writing. It does not do the\nwork to recover from mismatching checksums, that will come later. A few design\nchanges have been made from Jim\u0027s code (sorry Jim!)\n\n1) Use the generic direct-io code. Jim originally re-wrote all the generic DIO\ncode in order to account for all of BTRFS\u0027s oddities, but thanks to that work it\nseems like the best bet is to just ignore compression and such and just opt to\nfallback on buffered IO.\n\n2) Fallback on buffered IO for compressed or inline extents. Jim\u0027s code did\nit\u0027s own buffering to make dio with compressed extents work. Now we just\nfallback onto normal buffered IO.\n\n3) Use ordered extents for the writes so that all of the\n\nlock_extent()\nlookup_ordered()\n\ntype checks continue to work.\n\n4) Do the lock_extent() lookup_ordered() loop in readpage so we don\u0027t race with\nDIO writes.\n\nI\u0027ve tested this with fsx and everything works great. This patch depends on my\ndio and filemap.c patches to work. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3fd0a5585eb98e074fb9934549c8d85c49756c0d", "tree": "3e7ff9bd9678a5eea62818a2f4a50e19dda91a81", "parents": [ "efa56464562991b8c24f965199888806bd8c4b38" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:49:59 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:54 2010 -0400" }, "message": "Btrfs: Metadata ENOSPC handling for balance\n\nThis patch adds metadata ENOSPC handling for the balance code.\nIt is consisted by following major changes:\n\n1. Avoid COW tree leave in the phrase of merging tree.\n\n2. Handle interaction with snapshot creation.\n\n3. make the backref cache can live across transactions.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "efa56464562991b8c24f965199888806bd8c4b38", "tree": "e7c7e69e2931674ddf4f14ac08dfdf43b45de0f4", "parents": [ "4a500fd178c89b96fa166a2d9e7855df33429841" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:49:59 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:53 2010 -0400" }, "message": "Btrfs: Pre-allocate space for data relocation\n\nPre-allocate space for data relocation. This can detect ENOPSC\ncondition caused by fragmentation of free space.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4a500fd178c89b96fa166a2d9e7855df33429841", "tree": "b97fe0b0c1cb19388fcf28f77cd74a645ec69a61", "parents": [ "d68fc57b7e3245cfacf2e3b47acfed1946a11786" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:49:59 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:53 2010 -0400" }, "message": "Btrfs: Metadata ENOSPC handling for tree log\n\nPrevious patches make the allocater return -ENOSPC if there is no\nunreserved free metadata space. This patch updates tree log code\nand various other places to propagate/handle the ENOSPC error.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "d68fc57b7e3245cfacf2e3b47acfed1946a11786", "tree": "c2572fcd935017440c8370c8a12ceb49a7fc4f1f", "parents": [ "8929ecfa50f266163832eeacfbc3642ed5eb83b6" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:49:58 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:52 2010 -0400" }, "message": "Btrfs: Metadata reservation for orphan inodes\n\nreserve metadata space for handling orphan inodes\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "8929ecfa50f266163832eeacfbc3642ed5eb83b6", "tree": "e0177748af36d49d5f652cff0e421a8268cf7194", "parents": [ "0ca1f7ceb1991099ed5273885ebcf4323948c72e" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:49:58 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:52 2010 -0400" }, "message": "Btrfs: Introduce global metadata reservation\n\nReserve metadata space for extent tree, checksum tree and root tree\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0ca1f7ceb1991099ed5273885ebcf4323948c72e", "tree": "10758d6a55c529aced177da3f6bf45cf26361913", "parents": [ "a22285a6a32390195235171b89d157ed1a1fe932" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:48:47 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:51 2010 -0400" }, "message": "Btrfs: Update metadata reservation for delayed allocation\n\nIntroduce metadata reservation context for delayed allocation\nand update various related functions.\n\nThis patch also introduces EXTENT_FIRST_DELALLOC control bit for\nset/clear_extent_bit. It tells set/clear_bit_hook whether they\nare processing the first extent_state with EXTENT_DELALLOC bit\nset. This change is important if set/clear_extent_bit involves\nmultiple extent_state.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "a22285a6a32390195235171b89d157ed1a1fe932", "tree": "3fabc88a029e1af4f2fdcc708e7b62ef3cf3703a", "parents": [ "f0486c68e4bd9a06a5904d3eeb3a0d73a83befb8" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:48:46 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:50 2010 -0400" }, "message": "Btrfs: Integrate metadata reservation with start_transaction\n\nBesides simplify the code, this change makes sure all metadata\nreservation for normal metadata operations are released after\ncommitting transaction.\n\nChanges since V1:\n\nAdd code that check if unlink and rmdir will free space.\n\nAdd ENOSPC handling for clone ioctl.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "f0486c68e4bd9a06a5904d3eeb3a0d73a83befb8", "tree": "509428ef400ef45e875a3c448b63b86cbea36aea", "parents": [ "2ead6ae770d9f9dec9f4286bf0fd9001b4388c4b" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:46:25 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:50 2010 -0400" }, "message": "Btrfs: Introduce contexts for metadata reservation\n\nIntroducing metadata reseravtion contexts has two major advantages.\nFirst, it makes metadata reseravtion more traceable. Second, it can\nreclaim freed space and re-add them to the itself after transaction\ncommitted.\n\nBesides add btrfs_block_rsv structure and related helper functions,\nThis patch contains following changes:\n\nMove code that decides if freed tree block should be pinned into\nbtrfs_free_tree_block().\n\nMake space accounting more accurate, mainly for handling read only\nblock groups.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2ead6ae770d9f9dec9f4286bf0fd9001b4388c4b", "tree": "9f2d01f2c2acf2ca7e7447c3a92b34bd8d8da94c", "parents": [ "5da9d01b66458b180a6bee0e637a1d0a3effc622" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:46:25 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:49 2010 -0400" }, "message": "Btrfs: Kill init_btrfs_i()\n\nAll code in init_btrfs_i can be moved into btrfs_alloc_inode()\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5da9d01b66458b180a6bee0e637a1d0a3effc622", "tree": "47eca61c0ad07ddc791cb7677c548d663fbac818", "parents": [ "424499dbd0c4d88742bf581b5714b27fb44b9fef" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:46:25 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:48 2010 -0400" }, "message": "Btrfs: Shrink delay allocated space in a synchronized\n\nShrink delayed allocation space in a synchronized manner is more\ncontrollable than flushing all delay allocated space in an async\nthread.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "424499dbd0c4d88742bf581b5714b27fb44b9fef", "tree": "f46a76c8f23c7045b18b31a9206d0b22f324aad1", "parents": [ "b742bb82f1676d50103ade0ba89bfb79debabe73" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:46:25 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:48 2010 -0400" }, "message": "Btrfs: Kill allocate_wait in space_info\n\nWe already have fs_info-\u003echunk_mutex to avoid concurrent\nchunk creation.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b742bb82f1676d50103ade0ba89bfb79debabe73", "tree": "ceac53988a3c158571fb91d54e3027403363fb47", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Yan, Zheng", "email": "zheng.yan@oracle.com", "time": "Sun May 16 10:46:24 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue May 25 10:34:47 2010 -0400" }, "message": "Btrfs: Link block groups of different raid types\n\nThe size of reserved space is stored in space_info. If block groups\nof different raid types are linked to separate space_info, changing\nallocation profile will corrupt reserved space accounting.\n\nSigned-off-by: Yan Zheng \u003czheng.yan@oracle.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d", "tree": "c0d82cbd11daaf579b74121c6641d58947091094", "parents": [ "6109e2ce2600e2db26cd0424bb9c6ed019723288", "82f3952c02add60b15eea9151d4d99b6b82066c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)\n fix handling of offsets in cris eeprom.c, get rid of fake on-stack files\n get rid of home-grown mutex in cris eeprom.c\n switch ecryptfs_write() to struct inode *, kill on-stack fake files\n switch ecryptfs_get_locked_page() to struct inode *\n simplify access to ecryptfs inodes in -\u003ereadpage() and friends\n AFS: Don\u0027t put struct file on the stack\n Ban ecryptfs over ecryptfs\n logfs: replace inode uid,gid,mode initialization with helper function\n ufs: replace inode uid,gid,mode initialization with helper function\n udf: replace inode uid,gid,mode init with helper\n ubifs: replace inode uid,gid,mode initialization with helper function\n sysv: replace inode uid,gid,mode initialization with helper function\n reiserfs: replace inode uid,gid,mode initialization with helper function\n ramfs: replace inode uid,gid,mode initialization with helper function\n omfs: replace inode uid,gid,mode initialization with helper function\n bfs: replace inode uid,gid,mode initialization with helper function\n ocfs2: replace inode uid,gid,mode initialization with helper function\n nilfs2: replace inode uid,gid,mode initialization with helper function\n minix: replace inode uid,gid,mode init with helper\n ext4: replace inode uid,gid,mode init with helper\n ...\n\nTrivial conflict in fs/fs-writeback.c (mark bitfields unsigned)\n" }, { "commit": "ecc11fabf7ce16309112afe68fac466193ee7520", "tree": "946cf29541cfb4632d455ea84be052480b8ca677", "parents": [ "319b2be49e91398eae07db4dfc29972846dec649" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Thu Mar 04 17:31:47 2010 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:23 2010 -0400" }, "message": "btrfs: replace inode uid,gid,mode initialization with helper function\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f01cbd3f8148f2056567f829e07c157b28b2dd1e", "tree": "18d4a35bf25c9e17e11ce7a42015fae8ca5d009e", "parents": [ "bb4354538eb7b92f32cfedbad68c7be266c0b467" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu May 13 17:53:15 2010 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:18 2010 -0400" }, "message": "btrfs: constify xattr_handler\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ee9a3607fb03e804ddf624544105f4e34260c380", "tree": "ce41b6e0fa10982a306f6c142a92dbf3c9961284", "parents": [ "b492e95be0ae672922f4734acf3f5d35c30be948", "d515e86e639890b33a09390d062b0831664f04a2" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri May 21 21:27:26 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-2.6.35\n\nConflicts:\n\tfs/ext3/fsync.c\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "18e41da89d55014d25b9a24502ee92b7f50599f9", "tree": "5ce8ebd7456f377e4cfbff0ae83e84295617a4a8", "parents": [ "43aa7ac736a4e21aae4882bd8f7c67403aed45b8", "5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:55:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 15 12:55:31 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: check for read permission on src file in the clone ioctl\n" }, { "commit": "5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395", "tree": "e15101a2d1302ff6f2830f282197b34060ec963c", "parents": [ "9f680ce04ea19dabbbafe01b57b61930a9b70741" ], "author": { "name": "Dan Rosenberg", "email": "dan.j.rosenberg@gmail.com", "time": "Sat May 15 11:27:37 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat May 15 12:05:50 2010 -0400" }, "message": "Btrfs: check for read permission on src file in the clone ioctl\n\nThe existing code would have allowed you to clone a file that was\nonly open for writing\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7407cf355fdf5500430be966dbbde84a27293bad", "tree": "922861288ff38558ed721a79653f52b17b13bb95", "parents": [ "6a47dc1418682c83d603b491df1d048f73aa973e", "79dba2eaa771c3173957eccfd288e0e0d12e4d3f" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 29 09:36:24 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Apr 29 09:36:24 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-2.6.35\n\nConflicts:\n\tfs/block_dev.c\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "fbd9b09a177a481eda256447c881f014f29034fe", "tree": "ef7e213045382f82a1e3e3cf134d196a1045dd7a", "parents": [ "6b4517a7913a09d3259bb1d21c9cb300f12294bd" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Wed Apr 28 17:55:06 2010 +0400" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Wed Apr 28 19:47:36 2010 +0200" }, "message": "blkdev: generalize flags for blkdev_issue_fn functions\n\nThe patch just convert all blkdev_issue_xxx function to common\nset of flags. Wait/allocation semantics preserved.\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "e6d086d83cf7f102d48c006f58172a69ec0c15a4", "tree": "be8cf9ab5c593982dded8585d1e9961a1e83b1e5", "parents": [ "5129a469a91a91427334c40e29e64c6d0ab68caf" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Apr 26 10:27:54 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Apr 26 10:27:54 2010 +0200" }, "message": "btrfs: convert to using bdi_setup_and_register()\n\nIt\u0027s now a provided helper, so get rid of the internal setup\nand btrfs atomic_t bdi enumerator.\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "d6cf853d4d73c268fc8920ac4e812ee26a12847c", "tree": "c909145638eb5c4897ea7e424759eb9b564ebe18", "parents": [ "6a945f38be5f2c198853069a336c887a51d1a238", "9f680ce04ea19dabbbafe01b57b61930a9b70741" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 12 18:37:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 12 18:37:04 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: make sure the chunk allocator doesn\u0027t create zero length chunks\n Btrfs: fix data enospc check overflow\n" }, { "commit": "9f680ce04ea19dabbbafe01b57b61930a9b70741", "tree": "30447eb92851fe8542469a69cfd126bec30f9dd2", "parents": [ "ab6e24103cbd215e922938a4f58c75194761a60e" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 06 09:37:47 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 06 09:37:47 2010 -0400" }, "message": "Btrfs: make sure the chunk allocator doesn\u0027t create zero length chunks\n\nA recent commit allowed for smaller chunks to be created, but didn\u0027t\nmake sure they were always bigger than a stripe. After some divides,\nthis led to zero length stripes.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "795d580baec0d5386b83a8b557df47c20810e86b", "tree": "d0387c37562e9e27a4f43cf7ae425319cbdad359", "parents": [ "449cedf099b23a250e7d61982e35555ccb871182", "109f6aef5fc436f355ad027f4d97bd696df2049a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 13:21:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 05 13:21:15 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n Btrfs: add check for changed leaves in setup_leaf_for_split\n Btrfs: create snapshot references in same commit as snapshot\n Btrfs: fix small race with delalloc flushing waitqueue\u0027s\n Btrfs: use add_to_page_cache_lru, use __page_cache_alloc\n Btrfs: fix chunk allocate size calculation\n Btrfs: kill max_extent mount option\n Btrfs: fail to mount if we have problems reading the block groups\n Btrfs: check btrfs_get_extent return for IS_ERR()\n Btrfs: handle kmalloc() failure in inode lookup ioctl\n Btrfs: dereferencing freed memory\n Btrfs: Simplify num_stripes\u0027s calculation logical for __btrfs_alloc_chunk()\n Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()\n Btrfs: Remove unnecessary finish_wait() in wait_current_trans()\n Btrfs: add NULL check for do_walk_down()\n Btrfs: remove duplicate include in ioctl.c\n\nFix trivial conflict in fs/btrfs/compression.c due to slab.h include\ncleanups.\n" }, { "commit": "ab6e24103cbd215e922938a4f58c75194761a60e", "tree": "d54479feddd7fe625888dd62084621d4d0871c4b", "parents": [ "109f6aef5fc436f355ad027f4d97bd696df2049a" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 19 14:38:13 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Apr 05 16:04:50 2010 -0400" }, "message": "Btrfs: fix data enospc check overflow\n\nBecause we account for reserved space we get from the allocator before we\nactually account for allocating delalloc space, we can have a small window where\nthe amount of \"used\" space in a space_info is more than the total amount of\nspace in the space_info. This will cause a overflow in our check, so it will\nseem like we have _tons_ of free space, and we\u0027ll allow reservations to occur\nthat will end up larger than the amount of space we have. I\u0027ve seen users\nreport ENOSPC panic\u0027s in cow_file_range a few times recently, so I tried to\nreproduce this problem and found I could reproduce it if I ran one of my tests\nin a loop for like 20 minutes. With this patch my test ran all night without\nissues. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "109f6aef5fc436f355ad027f4d97bd696df2049a", "tree": "645cf1752f2c62579f6dfe028d8a5d918c6b6f45", "parents": [ "6bdb72ded1e281cd8844918c39d00cdd0e59f655" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 02 09:20:18 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Apr 05 14:42:01 2010 -0400" }, "message": "Btrfs: add check for changed leaves in setup_leaf_for_split\n\nsetup_leaf_for_split needs to drop the path and search again, and has\nchecks to see if the item we want to split changed size. But, it misses\nthe case where the leaf changed and now has enough room for the item\nwe want to insert.\n\nThis adds an extra check to make sure the leaf really needs splitting\nbefore we call btrfs_split_leaf(), which keeps us from trying to split\na leaf with a single item.\n\nbtrfs_split_leaf() will blindly split the single item leaf, leaving us\nwith one good leaf and one empty leaf and then a crash.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6bdb72ded1e281cd8844918c39d00cdd0e59f655", "tree": "39c25c85ddb1c2eecf7977e7e21a95f1c95ec21f", "parents": [ "b5cb160084fad438c513d0952849e597ffe9e3d9" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Mon Mar 15 17:27:13 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Apr 05 14:42:01 2010 -0400" }, "message": "Btrfs: create snapshot references in same commit as snapshot\n\nThis creates the reference to a new snapshot in the same commit as the\nsnapshot itself. This avoids the need for a second commit in order for a\nsnapshot to be persistent, and also avoids the problem of \"leaking\" a\nnew snapshot tree root if the host crashes before the second commit takes\nplace.\n\nIt is not at all clear to me why it wasn\u0027t always done this way. If there\nis still a reason for the two-stage {create,finish}_pending_snapshots()\napproach I\u0027m missing something! :)\n\nI\u0027ve been running this for a couple weeks under pretty heavy usage (a few\nsnapshots per minute) without obvious problems.\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b5cb160084fad438c513d0952849e597ffe9e3d9", "tree": "91a5a1352cc803695b2ae3b3217c82d423ca5edf", "parents": [ "28ecb60906e86e74e9ad4ac7e0218d8631e73a94" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 12 19:28:18 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Apr 05 14:42:00 2010 -0400" }, "message": "Btrfs: fix small race with delalloc flushing waitqueue\u0027s\n\nEverytime we start a new flushing thread, we init the waitqueue if there isn\u0027t a\nflushing thread running. The problem with this is we check\nspace_info-\u003eflushing, which we clear right before doing a wake_up on the\nflushing waitqueue, which causes problems if we init the waitqueue in the middle\nof clearing the flushing flagh and calling wake_up. This is hard to hit, but\nthe code is wrong anyway, so init the flushing/allocating waitqueue when\ncreating the space info and let it be. I haven\u0027t seen the panic since I\u0027ve been\nusing this patch. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "28ecb60906e86e74e9ad4ac7e0218d8631e73a94", "tree": "7214fa7bfb39f789aa4a78e174e39f61ef101b95", "parents": [ "0cad8a1130f77c7c445e3298c0e3593b3c0ef439" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed Mar 17 13:31:04 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Apr 05 14:41:51 2010 -0400" }, "message": "Btrfs: use add_to_page_cache_lru, use __page_cache_alloc\n\nPagecache pages should be allocated with __page_cache_alloc, so they\nobey pagecache memory policies.\n\nadd_to_page_cache_lru is exported, so it should be used. Benefits over\nusing a private pagevec: neater code, 128 bytes fewer stack used, percpu\nlru ordering is preserved, and finally don\u0027t need to flush pagevec\nbefore returning so batching may be shared with other LRU insertions.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e:\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0cad8a1130f77c7c445e3298c0e3593b3c0ef439", "tree": "1f045f7baccc9dd2c1ac805b94cdedc4bbab618f", "parents": [ "287a0ab91d25ca982f895a76402e5893b47ed7a6" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Wed Mar 17 20:45:56 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: fix chunk allocate size calculation\n\nIf the amount of free space left in a device is less than what we think should\nbe the minimum size, just ignore the minimum size and use the amount we have. I\nran into this running tests on a 600mb volume, the chunk allocator wouldn\u0027t let\nme allocate the last 52mb of the disk for data because we want to have at least\n64mb chunks for data. This patch fixes that problem. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "287a0ab91d25ca982f895a76402e5893b47ed7a6", "tree": "fcbe35daef2b4cbdc2bfc0c6026e7c45faef0245", "parents": [ "1b1d1f6625e517a08640ddb4b8f8a0e025243fe3" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 19 18:07:23 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: kill max_extent mount option\n\nAs Yan pointed out, theres not much reason for all this complicated math to\naccount for file extents being split up into max_extent chunks, since they are\nlikely to all end up in the same leaf anyway. Since there isn\u0027t much reason to\nuse max_extent, just remove the option altogether so we have one less thing we\nneed to test.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1b1d1f6625e517a08640ddb4b8f8a0e025243fe3", "tree": "d662fe7e7d9ddec1214982b3dcd955228e18562f", "parents": [ "6cf8bfbf5e88edfb09a2bf0631a067060f534592" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 19 20:49:55 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: fail to mount if we have problems reading the block groups\n\nWe don\u0027t actually check the return value of btrfs_read_block_groups, so we can\npossibly succeed to mount, but then fail to say read the superblock xattr for\nselinux which will cause the vfs code to deactivate the super.\n\nThis is a problem because in find_free_extent we just assume that we\nwill find the right space_info for the allocation we want. But if we\nfailed to read the block groups, we won\u0027t have setup any space_info\u0027s,\nand we\u0027ll hit a NULL pointer deref in find_free_extent.\n\nThis patch fixes that problem by checking the return value of\nbtrfs_read_block_groups, and failing out properly. I\u0027ve also added a\ncheck in find_free_extent so if for some reason we don\u0027t find an\nappropriate space_info, we just return -ENOSPC.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6cf8bfbf5e88edfb09a2bf0631a067060f534592", "tree": "70cc8040189bcd623e72ab1f09c6dc4fb40741e5", "parents": [ "c2b96929e2ca6914cf4a66cd8fe2a34c4a98277f" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Mar 20 11:22:10 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: check btrfs_get_extent return for IS_ERR()\n\nbtrfs_get_extent() never returns NULL, only a valid pointer or ERR_PTR()\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "c2b96929e2ca6914cf4a66cd8fe2a34c4a98277f", "tree": "acfc0f7c28305f2057e6eed88ffd8b34441ba2e1", "parents": [ "683be16eb6e19a35aca2473668652259ed074094" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Mar 20 11:24:15 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: handle kmalloc() failure in inode lookup ioctl\n\nReturn -ENOMEM if kmalloc() fails.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "683be16eb6e19a35aca2473668652259ed074094", "tree": "e6ed753b392a576999140ab9758db9c58dc60926", "parents": [ "f3eae7e8a5ed124bbc781e18ea10c21856017322" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Mar 20 11:24:48 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: dereferencing freed memory\n\nThe original code dereferenced range on the next line.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "f3eae7e8a5ed124bbc781e18ea10c21856017322", "tree": "5e275277720e220ac3c9c2e3dcc404c39a76bbe8", "parents": [ "ab59381ea43f81c977cbd09add26950aaf6cb9fe" ], "author": { "name": "Zhao Lei", "email": "zhaolei@cn.fujitsu.com", "time": "Thu Mar 25 12:32:59 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: Simplify num_stripes\u0027s calculation logical for __btrfs_alloc_chunk()\n\nWe can use this simple method to make source more readable.\n\nSigned-off-by: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "ab59381ea43f81c977cbd09add26950aaf6cb9fe", "tree": "5c009854f6c04996492b3bcadc538ed9264948b9", "parents": [ "471fa17dff556ad38caf26de097c0630530d8cbe" ], "author": { "name": "Zhao Lei", "email": "zhaolei@cn.fujitsu.com", "time": "Thu Mar 25 12:34:49 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:09 2010 -0400" }, "message": "Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()\n\nWe need to check return value of btrfs_search_slot() in\nbtrfs_read_chunk_tree() and do corresponding error handing.\n\nSigned-off-by: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "471fa17dff556ad38caf26de097c0630530d8cbe", "tree": "1a89bf8fa9eb34df3512c1216d5a92a29327a98d", "parents": [ "90d2c51dbb4db05c040bc7db264bb7ab35e35455" ], "author": { "name": "Zhao Lei", "email": "zhaolei@cn.fujitsu.com", "time": "Thu Mar 25 12:35:14 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:08 2010 -0400" }, "message": "Btrfs: Remove unnecessary finish_wait() in wait_current_trans()\n\nWe only need to call finish_wait() after wait loop.\n\nBy the way, this patch makes code of waiting loop similar to\nexample in wait.h(no functional change)\n\nSigned-off-by: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "90d2c51dbb4db05c040bc7db264bb7ab35e35455", "tree": "d97b50f0a064366aecce9671b8e1791263999e59", "parents": [ "2f3014fc2ab1e25c36531e19164c48182c168995" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Thu Mar 25 12:37:12 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:08 2010 -0400" }, "message": "Btrfs: add NULL check for do_walk_down()\n\nbtrfs_find_create_tree_block() may return NULL, so we must check the returned\nvalue, or we will access a NULL pointer.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2f3014fc2ab1e25c36531e19164c48182c168995", "tree": "84a906ae0d4c963377d768d8ec80a308122a4687", "parents": [ "8ad6fcab564c5bc956bdc3dfa440ab152b6e780f" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Thu Mar 25 17:22:45 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 30 21:19:08 2010 -0400" }, "message": "Btrfs: remove duplicate include in ioctl.c\n\nfs/btrfs/ioctl.c: ctree.h is included more than once.\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "441f4058a04b2943685ff94e0f5f1992b0b3649e", "tree": "80a61f6dddcf7d5831a8bd3771ffa2b430af3935", "parents": [ "7c34691abe23741bfc7d2514efd5a39f0e0ecb06", "8ad6fcab564c5bc956bdc3dfa440ab152b6e780f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:50:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:50:55 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (30 commits)\n Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree\n Btrfs: allow treeid\u003d\u003d0 in the inode lookup ioctl\n Btrfs: return keys for large items to the search ioctl\n Btrfs: fix key checks and advance in the search ioctl\n Btrfs: buffer results in the space_info ioctl\n Btrfs: use __u64 types in ioctl.h\n Btrfs: fix search_ioctl key advance\n Btrfs: fix gfp flags masking in the compression code\n Btrfs: don\u0027t look at bio flags after submit_bio\n btrfs: using btrfs_stack_device_id() get devid\n btrfs: use memparse\n Btrfs: add a \"df\" ioctl for btrfs\n Btrfs: cache the extent state everywhere we possibly can V2\n Btrfs: cache ordered extent when completing io\n Btrfs: cache extent state in find_delalloc_range\n Btrfs: change the ordered tree to use a spinlock instead of a mutex\n Btrfs: finish read pages in the order they are submitted\n btrfs: fix btrfs_mkdir goto for no free objectids\n Btrfs: flush data on snapshot creation\n Btrfs: make df be a little bit more understandable\n ...\n" }, { "commit": "8ad6fcab564c5bc956bdc3dfa440ab152b6e780f", "tree": "38670d63e5315650f3e6efe2a2a8025e945b4743", "parents": [ "1b53ac4d1b75b23bdc2b54ace787b8f718a987ef" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:23:10 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:23:10 2010 -0400" }, "message": "Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree\n\nThis is used by the inode lookup ioctl to follow all the backrefs up\nto the subvol root. But the search being done would sometimes land one\npast the last item in the leaf instead of finding the backref.\n\nThis changes the search to look for the highest possible backref and hop\nback one item. It also fixes a leaked path on failure to find the root.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1b53ac4d1b75b23bdc2b54ace787b8f718a987ef", "tree": "4ba3bf8dc5159d4b382b1e44306eef1875203c6a", "parents": [ "90fdde147fd32d18a20be5b498d5f26e56cca8a3" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:17:05 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:17:05 2010 -0400" }, "message": "Btrfs: allow treeid\u003d\u003d0 in the inode lookup ioctl\n\nWhen a root id of 0 is sent to the inode lookup ioctl, it will\nuse the root of the file we\u0027re ioctling and pass the root id\nback to userland along with the results.\n\nThis allows userland to do searches based on that root later on.\n\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "90fdde147fd32d18a20be5b498d5f26e56cca8a3", "tree": "ab861e9190145df710345bb1e54c5f3f1d77d296", "parents": [ "abc6e1341bda974e2d0eddb75f57a20ac18e9b33" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:14:54 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:14:54 2010 -0400" }, "message": "Btrfs: return keys for large items to the search ioctl\n\nThe search ioctl was skipping large items entirely (ones that are too\nbig for the results buffer). This changes things to at least copy\nthe item header so that we can send information about the item back to\nuserland.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "abc6e1341bda974e2d0eddb75f57a20ac18e9b33", "tree": "399e587e8e94dd4ec2894f52f377a189a21ece2a", "parents": [ "7fde62bffb576d384ea49a3aed3403d5609ee5bc" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:10:08 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 18 12:10:08 2010 -0400" }, "message": "Btrfs: fix key checks and advance in the search ioctl\n\nThe search ioctl was working well for finding tree roots, but using it for\ngeneric searches requires a few changes to how the keys are advanced.\nThis treats the search control min fields for objectid, type and offset\nmore like a key, where we drop the offset to zero once we bump the type,\netc.\n\nThe downside of this is that we are changing the min_type and min_offset\nfields during the search, and so the ioctl caller needs extra checks to make sure\nthe keys in the result are the ones it wanted.\n\nThis also changes key_in_sk to use btrfs_comp_cpu_keys, just to make\nthings more readable.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7fde62bffb576d384ea49a3aed3403d5609ee5bc", "tree": "0fc0be615e657ed385835b56741c3a62c2c76fff", "parents": [ "ce769a2904bf5a9110ef534a7702397e38e2b3e9" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 16 15:40:10 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 16 15:40:10 2010 -0400" }, "message": "Btrfs: buffer results in the space_info ioctl\n\nThe space_info ioctl was using copy_to_user inside rcu_read_lock. This\ncommit changes things to copy into a buffer first and then dump the\nresult down to userland.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "ce769a2904bf5a9110ef534a7702397e38e2b3e9", "tree": "f783a7e8ca35053f534ad2bc64e52bf0d08442c2", "parents": [ "854d2c3531e6d32e76b94ca5e096ea54c7497e40" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Mar 16 00:02:26 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 16 14:24:27 2010 -0400" }, "message": "Btrfs: use __u64 types in ioctl.h\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "854d2c3531e6d32e76b94ca5e096ea54c7497e40", "tree": "50775c23fe46b586b24294217e4eb81fbc0e8365", "parents": [ "ef5780c018ed169a77b623f87c4ba52faa8ad0fe" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Mar 16 00:02:25 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Mar 16 14:24:27 2010 -0400" }, "message": "Btrfs: fix search_ioctl key advance\n\nkey-\u003etype is u8, not u64.\n\nfs/btrfs/ioctl.c: In function \u0027copy_to_sk\u0027:\nfs/btrfs/ioctl.c:1024: warning: comparison is always true due to limited range of data type\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "ef5780c018ed169a77b623f87c4ba52faa8ad0fe", "tree": "4c93fbaa09ed4b2f4b9713ae462646d149be8550", "parents": [ "5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Mar 15 11:05:29 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:05:57 2010 -0400" }, "message": "Btrfs: fix gfp flags masking in the compression code\n\nGFP_FS must be masked out, NOFS can\u0027t be or\u0027d in.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e", "tree": "598f33540071cd31bd7738b5d6246bfbaa0d9b3b", "parents": [ "a343832f1a55c74791a8a37053fc02ad80640710" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 10:21:30 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:00:15 2010 -0400" }, "message": "Btrfs: don\u0027t look at bio flags after submit_bio\n\nAfter callling submit_bio, the bio can be freed at any time. The\nbtrfs submission thread helper was checking the bio flags too late,\nwhich might not give the correct answer.\n\nWhen CONFIG_DEBUG_PAGE_ALLOC is turned on, it can lead to oopsen.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "a343832f1a55c74791a8a37053fc02ad80640710", "tree": "79e920025747703c06ba7a97e433a3ad307d80fe", "parents": [ "91748467a5c5884e44ad5cf58630c0c28474f1f6" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jan 06 11:48:18 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:00:14 2010 -0400" }, "message": "btrfs: using btrfs_stack_device_id() get devid\n\nWe can use btrfs_stack_device_id() to get dev_item-\u003edevid\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "91748467a5c5884e44ad5cf58630c0c28474f1f6", "tree": "593f2449e069e34fe96ba0e59efa8bf71242ad46", "parents": [ "1406e4327be3a533a2b18582f715ce2cfbcf6804" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Sun Feb 28 10:59:11 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:00:14 2010 -0400" }, "message": "btrfs: use memparse\n\nUse memparse() instead of its own private implementation.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: linux-btrfs@vger.kernel.org\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1406e4327be3a533a2b18582f715ce2cfbcf6804", "tree": "40cafa639095b1a652cd013746394b7a77e52b69", "parents": [ "2ac55d41b5d6bf49e76bc85db5431240617e2f8f" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Wed Jan 13 18:19:06 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:00:14 2010 -0400" }, "message": "Btrfs: add a \"df\" ioctl for btrfs\n\ndf is a very loaded question in btrfs. This gives us a way to get the per-space\nusage information so we can tell exactly what is in use where. This will help\nus figure out ENOSPC problems, and help users better understand where their disk\nspace is going.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2ac55d41b5d6bf49e76bc85db5431240617e2f8f", "tree": "ee8e2a716ef0b50388ef5e4a86387ec0499bca89", "parents": [ "5a1a3df1f6c86926cfe8657e6f9b4b4c2f467d60" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Wed Feb 03 19:33:23 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Mar 15 11:00:13 2010 -0400" }, "message": "Btrfs: cache the extent state everywhere we possibly can V2\n\nThis patch just goes through and fixes everybody that does\n\nlock_extent()\nblah\nunlock_extent()\n\nto use\n\nlock_extent_bits()\nblah\nunlock_extent_cached()\n\nand pass around a extent_state so we only have to do the searches once per\nfunction. This gives me about a 3 mb/s boots on my random write test. I have\nnot converted some things, like the relocation and ioctl\u0027s, since they aren\u0027t\nheavily used and the relocation stuff is in the middle of being re-written. I\nalso changed the clear_extent_bit() to only unset the cached state if we are\nclearing EXTENT_LOCKED and related stuff, so we can do things like this\n\nlock_extent_bits()\nclear delalloc bits\nunlock_extent_cached()\n\nwithout losing our cached state. I tested this thoroughly and turned on\nLEAK_DEBUG to make sure we weren\u0027t leaking extent states, everything worked out\nfine.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" } ], "next": "5a1a3df1f6c86926cfe8657e6f9b4b4c2f467d60" }