)]}' { "log": [ { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "884b8267d5f13bdcdc7e675ecbd0dbb0257689bb", "tree": "637c734a7466e43d3786968891e746c5b70d6a4b", "parents": [ "d14f5b810b49c7dbd1a01be1c6d3641d46090080", "c9ddec74aa950a220cc4caa5215cfc5d886050b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 05 12:29:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 05 12:29:25 2011 -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: don\u0027t warn in btrfs_add_orphan\n Btrfs: fix free space cache when there are pinned extents and clusters V2\n Btrfs: Fix uninitialized root flags for subvolumes\n btrfs: clear __GFP_FS flag in the space cache inode\n Btrfs: fix memory leak in start_transaction()\n Btrfs: fix memory leak in btrfs_ioctl_start_sync()\n Btrfs: fix subvol_sem leak in btrfs_rename()\n Btrfs: Fix oops for defrag with compression turned on\n Btrfs: fix /proc/mounts info.\n Btrfs: fix compiler warning in file.c\n" }, { "commit": "c9ddec74aa950a220cc4caa5215cfc5d886050b7", "tree": "b8e40481dfe5f7e3bd749a29c6f0df70f1efd171", "parents": [ "43be21462d8c263e2449b52b23326232fd710bee" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Mar 28 13:43:25 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 05 01:20:24 2011 -0400" }, "message": "Btrfs: don\u0027t warn in btrfs_add_orphan\n\nWhen I moved the orphan adding to btrfs_truncate I missed the fact that during\norphan cleanup we just add the orphan items to the orphan list without going\nthrough btrfs_orphan_add, which results in lots of warnings on mount if you have\nany orphan items that need to be truncated. Just remove this warning since it\u0027s\nok, this will allow all of the normal space accounting take place. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "adae52b94e18afa1f84fab67df2a8a872c2f5533", "tree": "fb9259b9eac14ac950d127faf1788392081010b0", "parents": [ "6e8df2ae89ab37730c0062782f844c66ecfc97a7" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Thu Mar 31 09:43:23 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 05 01:19:43 2011 -0400" }, "message": "btrfs: clear __GFP_FS flag in the space cache inode\n\nthe object id of the space cache inode\u0027s key is allocated from the relative\nroot, just like the regular file. So we can\u0027t identify space cache inode by\nchecking the object id of the inode\u0027s key, and we have to clear __GFP_FS flag\nat the time we look up the space cache inode.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b44c59a80ded004e1a82712e5f9e17b131c03221", "tree": "36588193bf5cc91d80d9d8376d5bad78f2babd0c", "parents": [ "fe3f566cd19bb6d787c92b2e202c85f929abf3ac" ], "author": { "name": "Johann Lombardi", "email": "johann@whamcloud.com", "time": "Thu Mar 31 13:23:47 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 05 01:19:42 2011 -0400" }, "message": "Btrfs: fix subvol_sem leak in btrfs_rename()\n\nbtrfs_rename() does not release the subvol_sem if the transaction failed to start.\n\nSigned-off-by: Johann Lombardi \u003cjohann@whamcloud.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "fe3f566cd19bb6d787c92b2e202c85f929abf3ac", "tree": "216c33bb0ed94e7791141939ea763620576d82b0", "parents": [ "200da64e0b039f873f0f20481e6a7d056e7cc6c9" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Mar 28 08:30:38 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Apr 05 01:19:42 2011 -0400" }, "message": "Btrfs: Fix oops for defrag with compression turned on\n\nWhen we defrag a file, whose size can be fit into an inline extent,\nwith compression enabled, the compress type is set to be\nfs_info-\u003ecompress_type, which is 0 if the btrfs filesystem is mounted\nwithout compress option. This leads to oops.\n\nReported-by: Daniel Blueman \u003cdaniel.blueman@gmail.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "212a17ab878305600e607f637d2d8a49d9f7ef25", "tree": "64ad97fcc3d5c49ebd735f5508643c798aeecddf", "parents": [ "baaca1a61497d97cec595fedce03b0a23b983e64", "d9d04879321af570ea7285c6dad92d9c3cd108a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 28 15:31:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 28 15:31:05 2011 -0700" }, "message": "Merge branch \u0027for-linus-unmerged\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* \u0027for-linus-unmerged\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (45 commits)\n Btrfs: fix __btrfs_map_block on 32 bit machines\n btrfs: fix possible deadlock by clearing __GFP_FS flag\n btrfs: check link counter overflow in link(2)\n btrfs: don\u0027t mess with i_nlink of unlocked inode in rename()\n Btrfs: check return value of btrfs_alloc_path()\n Btrfs: fix OOPS of empty filesystem after balance\n Btrfs: fix memory leak of empty filesystem after balance\n Btrfs: fix return value of setflags ioctl\n Btrfs: fix uncheck memory allocations\n btrfs: make inode ref log recovery faster\n Btrfs: add btrfs_trim_fs() to handle FITRIM\n Btrfs: adjust btrfs_discard_extent() return errors and trimmed bytes\n Btrfs: make btrfs_map_block() return entire free extent for each device of RAID0/1/10/DUP\n Btrfs: make update_reserved_bytes() public\n btrfs: return EXDEV when linking from different subvolumes\n Btrfs: Per file/directory controls for COW and compression\n Btrfs: add datacow flag in inode flag\n btrfs: use GFP_NOFS instead of GFP_KERNEL\n Btrfs: check return value of read_tree_block()\n btrfs: properly access unaligned checksum buffer\n ...\n\nFix up trivial conflicts in fs/btrfs/volumes.c due to plug removal in\nthe block layer.\n" }, { "commit": "1561deda687eef0e95065f1268d680ddc5976ee7", "tree": "3ad8a8305fc3ca960cf7ef472f64d9cfef246ffd", "parents": [ "c055e99eea6e4f614267632fac546e7896c0227b" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Sun Mar 27 16:07:36 2011 +0800" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:58 2011 -0400" }, "message": "btrfs: fix possible deadlock by clearing __GFP_FS flag\n\nUsing the GFP_HIGHUSER_MOVABLE flag to allocate the metadata\u0027s page may cause\ndeadlock.\n Task1\n open()\n ...\n btrfs_search_slot()\n ...\n btrfs_cow_block()\n\t...\n\talloc_page()\n\t wait for reclaiming\n\t\t\t\t\tshrink_slab()\n\t\t\t\t\t ...\n\t\t\t\t\t shrink_icache_memory()\n\t\t\t\t\t ...\n\t\t\t\t\t btrfs_evict_inode()\n\t\t\t\t\t ...\n\t\t\t\t\t btrfs_search_slot()\n\nIf the path is locked by task1, the deadlock happens.\n\nSo the btree\u0027s page cache is different with the file\u0027s page cache, it can not\nallocate pages by GFP_HIGHUSER_MOVABLE flag, we must clear __GFP_FS flag in\nGFP_HIGHUSER_MOVABLE flag.\n\nReported-by: Itaru Kitayama \u003ckitayama@cl.bb4u.ne.jp\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "c055e99eea6e4f614267632fac546e7896c0227b", "tree": "df65ff7c1a3b0c4301edffbadd9f23f9023e5159", "parents": [ "92986796d84ef939e304099dece32572a755b280" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Fri Mar 04 17:15:18 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:56 2011 -0400" }, "message": "btrfs: check link counter overflow in link(2)\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "92986796d84ef939e304099dece32572a755b280", "tree": "d3356c2aa2bbc64166b09647c8760f7a6941df44", "parents": [ "c2db1073fdf9757e6fd8b4a59d15b6ecc7a2af8a" ], "author": { "name": "Al Viro", "email": "viro@ZenIV.linux.org.uk", "time": "Fri Mar 04 17:14:37 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:55 2011 -0400" }, "message": "btrfs: don\u0027t mess with i_nlink of unlocked inode in rename()\n\nold_inode is not locked; it\u0027s not safe to play with its link\ncount. Instead of bumping it and calling btrfs_unlink_inode(),\nadd a variant of the latter that does not do btrfs_drop_nlink()/\nbtrfs_update_inode(), call it instead of btrfs_inc_nlink()/\nbtrfs_unlink_inode() and do btrfs_update_inode() ourselves.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "c2db1073fdf9757e6fd8b4a59d15b6ecc7a2af8a", "tree": "024264b2d27f75b967efbde01060ebb8626fa39d", "parents": [ "c59021f846881a957ac5afe456d0f59d6a517b61" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Tue Mar 01 06:48:31 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:54 2011 -0400" }, "message": "Btrfs: check return value of btrfs_alloc_path()\n\nAdding the check on the return value of btrfs_alloc_path() to several places.\nAnd, some of callers are modified by this change.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "dac97e516c617f9c797f64b0224050b70aea30c7", "tree": "c5c7e7a40e649ee9beb9014b284d3a6e66fb94f2", "parents": [ "c622ae6085d0c6ad834213bbf1477eb311359078" ], "author": { "name": "Yoshinori Sano", "email": "yoshinori.sano@gmail.com", "time": "Tue Feb 15 12:01:42 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:49 2011 -0400" }, "message": "Btrfs: fix uncheck memory allocations\n\nTo make Btrfs code more robust, several return value checks where memory\nallocation can fail are introduced. I use BUG_ON where I don\u0027t know how\nto handle the error properly, which increases the number of using the\nnotorious BUG_ON, though.\n\nSigned-off-by: Yoshinori Sano \u003cyoshinori.sano@gmail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3ab3564f018b9b265d0258e4a231794bacd5ad85", "tree": "53bb771dbb18194a9d13ce2c84c81f2ab834b7e5", "parents": [ "75e7cb7fe0c391561bd3af36515be3f3c64a04c6" ], "author": { "name": "Mark Fasheh", "email": "mfasheh@suse.com", "time": "Tue Mar 22 17:20:26 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:42 2011 -0400" }, "message": "btrfs: return EXDEV when linking from different subvolumes\n\nbtrfs_link returns EPERM if a cross-subvolume link is attempted.\n\nHowever, in this case I believe EXDEV to be the more appropriate value.\n\u003eFrom the link(2) man page:\n\nEXDEV oldpath and newpath are not on the same mounted file system. (Linux\n permits a file system to be mounted at multiple points, but link()\n does not work across different mount points, even if the same file\n system is mounted on both.)\n\nThis matters because an application may have different behaviors based on\nreturn codes.\n\nSigned-off-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "75e7cb7fe0c391561bd3af36515be3f3c64a04c6", "tree": "3738481e2db10b2904a4434e4ca42d326da02be7", "parents": [ "32471f6e1983922473573da62cbee58699574aa4" ], "author": { "name": "Liu Bo", "email": "liubo2009@cn.fujitsu.com", "time": "Tue Mar 22 10:12:20 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:41 2011 -0400" }, "message": "Btrfs: Per file/directory controls for COW and compression\n\nData compression and data cow are controlled across the entire FS by mount\noptions right now. ioctls are needed to set this on a per file or per\ndirectory basis. This has been proposed previously, but VFS developers\nwanted us to use generic ioctls rather than btrfs-specific ones.\n\nAccording to Chris\u0027s comment, there should be just one true compression\nmethod(probably LZO) stored in the super. However, before this, we would\nwait for that one method is stable enough to be adopted into the super.\nSo I list it as a long term goal, and just store it in ram today.\n\nAfter applying this patch, we can use the generic \"FS_IOC_SETFLAGS\" ioctl to\ncontrol file and directory\u0027s datacow and compression attribute.\n\nNOTE:\n - The compression type is selected by such rules:\n If we mount btrfs with compress options, ie, zlib/lzo, the type is it.\n Otherwise, we\u0027ll use the default compress type (zlib today).\n\nv1-\u003ev2:\n- rebase to the latest btrfs.\nv2-\u003ev3:\n- fix a problem, i.e. when a file is set NOCOW via mount option, then this NOCOW\n will be screwed by inheritance from parent directory.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1abe9b8a138c9988ba8f7bfded6453649a31541f", "tree": "9fe0c181e78b075b65f6b1802f0a5092e7afbc6a", "parents": [ "240f62c8756df285da11469259b3900f32883168" ], "author": { "name": "liubo", "email": "liubo2009@cn.fujitsu.com", "time": "Thu Mar 24 11:18:59 2011 +0000" }, "committer": { "name": "root", "email": "Chris Mason chris.mason@oracle.com", "time": "Mon Mar 28 05:37:33 2011 -0400" }, "message": "Btrfs: add initial tracepoint support for btrfs\n\nTracepoints can provide insight into why btrfs hits bugs and be greatly\nhelpful for debugging, e.g\n dd-7822 [000] 2121.641088: btrfs_inode_request: root \u003d 5(FS_TREE), gen \u003d 4, ino \u003d 256, blocks \u003d 8, disk_i_size \u003d 0, last_trans \u003d 8, logged_trans \u003d 0\n dd-7822 [000] 2121.641100: btrfs_inode_new: root \u003d 5(FS_TREE), gen \u003d 8, ino \u003d 257, blocks \u003d 0, disk_i_size \u003d 0, last_trans \u003d 0, logged_trans \u003d 0\n btrfs-transacti-7804 [001] 2146.935420: btrfs_cow_block: root \u003d 2(EXTENT_TREE), refs \u003d 2, orig_buf \u003d 29368320 (orig_level \u003d 0), cow_buf \u003d 29388800 (cow_level \u003d 0)\n btrfs-transacti-7804 [001] 2146.935473: btrfs_cow_block: root \u003d 1(ROOT_TREE), refs \u003d 2, orig_buf \u003d 29364224 (orig_level \u003d 0), cow_buf \u003d 29392896 (cow_level \u003d 0)\n btrfs-transacti-7804 [001] 2146.972221: btrfs_transaction_commit: root \u003d 1(ROOT_TREE), gen \u003d 8\n flush-btrfs-2-7821 [001] 2155.824210: btrfs_chunk_alloc: root \u003d 3(CHUNK_TREE), offset \u003d 1103101952, size \u003d 1073741824, num_stripes \u003d 1, sub_stripes \u003d 0, type \u003d DATA\n flush-btrfs-2-7821 [001] 2155.824241: btrfs_cow_block: root \u003d 2(EXTENT_TREE), refs \u003d 2, orig_buf \u003d 29388800 (orig_level \u003d 0), cow_buf \u003d 29396992 (cow_level \u003d 0)\n flush-btrfs-2-7821 [001] 2155.824255: btrfs_cow_block: root \u003d 4(DEV_TREE), refs \u003d 2, orig_buf \u003d 29372416 (orig_level \u003d 0), cow_buf \u003d 29401088 (cow_level \u003d 0)\n flush-btrfs-2-7821 [000] 2155.824329: btrfs_cow_block: root \u003d 3(CHUNK_TREE), refs \u003d 2, orig_buf \u003d 20971520 (orig_level \u003d 0), cow_buf \u003d 20975616 (cow_level \u003d 0)\n btrfs-endio-wri-7800 [001] 2155.898019: btrfs_cow_block: root \u003d 5(FS_TREE), refs \u003d 2, orig_buf \u003d 29384704 (orig_level \u003d 0), cow_buf \u003d 29405184 (cow_level \u003d 0)\n btrfs-endio-wri-7800 [001] 2155.898043: btrfs_cow_block: root \u003d 7(CSUM_TREE), refs \u003d 2, orig_buf \u003d 29376512 (orig_level \u003d 0), cow_buf \u003d 29409280 (cow_level \u003d 0)\n\nHere is what I have added:\n\n1) ordere_extent:\n btrfs_ordered_extent_add\n btrfs_ordered_extent_remove\n btrfs_ordered_extent_start\n btrfs_ordered_extent_put\n\nThese provide critical information to understand how ordered_extents are\nupdated.\n\n2) extent_map:\n btrfs_get_extent\n\nextent_map is used in both read and write cases, and it is useful for tracking\nhow btrfs specific IO is running.\n\n3) writepage:\n __extent_writepage\n btrfs_writepage_end_io_hook\n\nPages are cirtical resourses and produce a lot of corner cases during writeback,\nso it is valuable to know how page is written to disk.\n\n4) inode:\n btrfs_inode_new\n btrfs_inode_request\n btrfs_inode_evict\n\nThese can show where and when a inode is created, when a inode is evicted.\n\n5) sync:\n btrfs_sync_file\n btrfs_sync_fs\n\nThese show sync arguments.\n\n6) transaction:\n btrfs_transaction_commit\n\nIn transaction based filesystem, it will be useful to know the generation and\nwho does commit.\n\n7) back reference and cow:\n\tbtrfs_delayed_tree_ref\n\tbtrfs_delayed_data_ref\n\tbtrfs_delayed_ref_head\n\tbtrfs_cow_block\n\nBtrfs natively supports back references, these tracepoints are helpful on\nunderstanding btrfs\u0027s COW mechanism.\n\n8) chunk:\n\tbtrfs_chunk_alloc\n\tbtrfs_chunk_free\n\nChunk is a link between physical offset and logical offset, and stands for space\ninfomation in btrfs, and these are helpful on tracing space things.\n\n9) reserved_extent:\n\tbtrfs_reserved_extent_alloc\n\tbtrfs_reserved_extent_free\n\nThese can show how btrfs uses its space.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "c0da7aa1a2d8fcafe271a7077599253c8ed94bb2", "tree": "232a22b93eb56090c5a0ecdba377ffb761d5549c", "parents": [ "98bc3149fad639c8f50c7110b961a2a2fe085eed" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue Mar 22 11:05:07 2011 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Mar 25 19:08:19 2011 -0400" }, "message": "Btrfs: mark the bio with an error if we have a failure in dio\n\nI noticed that dio_end_io calls the appropriate endio function with an error,\nbut the endio functions don\u0027t actually do anything with that error, they assume\nthat if there was an error then the bio will not be uptodate. So if we had\nchecksum failures we would never pass back EIO. So if there is an error in our\nendio functions make sure to clear the uptodate flag on the bio. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "98bc3149fad639c8f50c7110b961a2a2fe085eed", "tree": "76b102e79a9adde87c4e93f475db643567c393da", "parents": [ "4e69b598f6cfb0940b75abf7e179d6020e94ad1e" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue Mar 22 11:00:46 2011 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Mar 25 19:08:18 2011 -0400" }, "message": "Btrfs: don\u0027t allocate dip-\u003ecsums when doing writes\n\nWhen doing direct writes we store the checksums in the ordered sum stuff in the\nordered extent for writing them when the write completes, so we don\u0027t even use\nthe dip-\u003ecsums array. So if we\u0027re writing, don\u0027t bother allocating dip-\u003ecsums\nsince we won\u0027t use it anyway. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "6c5103890057b1bb781b26b7aae38d33e4c517d8", "tree": "e6e57961dcddcb5841acb34956e70b9dc696a880", "parents": [ "3dab04e6978e358ad2307bca563fabd6c5d2c58b", "9d2e157d970a73b3f270b631828e03eb452d525e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block: (65 commits)\n Documentation/iostats.txt: bit-size reference etc.\n cfq-iosched: removing unnecessary think time checking\n cfq-iosched: Don\u0027t clear queue stats when preempt.\n blk-throttle: Reset group slice when limits are changed\n blk-cgroup: Only give unaccounted_time under debug\n cfq-iosched: Don\u0027t set active queue in preempt\n block: fix non-atomic access to genhd inflight structures\n block: attempt to merge with existing requests on plug flush\n block: NULL dereference on error path in __blkdev_get()\n cfq-iosched: Don\u0027t update group weights when on service tree\n fs: assign sb-\u003es_bdi to default_backing_dev_info if the bdi is going away\n block: Require subsystems to explicitly allocate bio_set integrity mempool\n jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n fs: make fsync_buffers_list() plug\n mm: make generic_writepages() use plugging\n blk-cgroup: Add unaccounted time to timeslice_used.\n block: fixup plugging stubs for !CONFIG_BLOCK\n block: remove obsolete comments for blkdev_issue_zeroout.\n blktrace: Use rq-\u003ecmd_flags directly in blk_add_trace_rq.\n ...\n\nFix up conflicts in fs/{aio.c,super.c}\n" }, { "commit": "22a94d44bd6876a90630338229da6c0436d46593", "tree": "50e5c7dd52ccf9292240de995e5b42b1619bcd82", "parents": [ "41415730a1050499fbd63b3f7dd59b3a4c3bb91a" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Wed Mar 16 16:47:17 2011 -0400" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:41 2011 -0400" }, "message": "Btrfs: add checks to verify dir items are correct\n\nWe need to make sure the dir items we get are valid dir items. So any time we\ntry and read one check it with verify_dir_item, which will do various sanity\nchecks to make sure it looks sane. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "695a0d0da09e75c4475bbb303def159023ef72ca", "tree": "96f9d223a3395bd015d2922b5e797634be27b161", "parents": [ "930f028abe39dfd0849b53131d19c4b67aacbe67" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 04 15:46:53 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:33 2011 -0400" }, "message": "Btrfs: add a comment explaining what btrfs_cont_expand does\n\nEverytime I have to deal with btrfs_cont_expand I stare at it for 20 minutes\ntrying to remember what exactly it does and why the hell we need it. So add a\ncomment to save future-Josef some time. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "930f028abe39dfd0849b53131d19c4b67aacbe67", "tree": "a7dc6cd1c09e351a88f43bd353000310745045d7", "parents": [ "f0cd846e9221811d87047f1428cf5226e7236efe" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 04 14:41:41 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:32 2011 -0400" }, "message": "Btrfs: use mark_inode_dirty when expanding the file\n\nMark_inode_dirty will call btrfs_dirty_inode which will take care of updating\nthe inode. This makes setsize a little cleaner since we don\u0027t have to start a\ntransaction and update the inode in there, we can just call mark_inode_dirty.\nThanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "f0cd846e9221811d87047f1428cf5226e7236efe", "tree": "7621f631bc39b92decaab53ca0fcd2f43b4ab072", "parents": [ "ded5db9de78f963979e1605f859de67626f54693" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 04 14:37:08 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:30 2011 -0400" }, "message": "Btrfs: only add orphan items when truncating\n\nWe don\u0027t need an orphan item when expanding files, we just need them for\ntruncating them, so only add the orphan item in btrfs_truncate instead of in\nbtrfs_setsize. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "ded5db9de78f963979e1605f859de67626f54693", "tree": "d52b91b659b22f5f24ba8b8bf42a3a829e335010", "parents": [ "66b4ffd110f9b48b8d8c1319ee446b53b8d073bf" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Mar 04 14:09:46 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:28 2011 -0400" }, "message": "Btrfs: make sure to remove the orphan item from the in-memory list\n\nThis fixes a problem where if truncate fails the inode will still be on the in\nmemory orphan list. This is will make us complain when the inode gets destroyed\nbecause it\u0027s still on the orphan list. So if we fail just remove us from the in\nmemory list and carry on.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "66b4ffd110f9b48b8d8c1319ee446b53b8d073bf", "tree": "690b14cda46b47c0d71be15a82019c35729afa75", "parents": [ "3893e33b0bebee2f67d96b6c15259dc884523c20" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jan 31 16:22:42 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:26 2011 -0400" }, "message": "Btrfs: handle errors in btrfs_orphan_cleanup\n\nIf we cannot truncate an inode for some reason we will never delete the orphan\nitem associated with that inode, which means that we will loop forever in\nbtrfs_orphan_cleanup. Instead of doing this just return error so we fail to\nmount. It sucks, but hey it\u0027s better than hanging. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "3893e33b0bebee2f67d96b6c15259dc884523c20", "tree": "3c04879bcd5a269252615c56a765cede5ba1004e", "parents": [ "a41ad394a03b802497958d7c98a9dcf607266645" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jan 31 16:03:11 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:24 2011 -0400" }, "message": "Btrfs: cleanup error handling in the truncate path\n\nNow that we can handle having errors in the truncate path lets make sure we\nreturn errors instead of doing BUG_ON() and such. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "a41ad394a03b802497958d7c98a9dcf607266645", "tree": "f18d97b7feb5c3dcf0d3c1a670d4eaf6b94e8b79", "parents": [ "dc89e9824464e91fa0b06267864ceabe3186fd8b" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jan 31 15:30:16 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:22 2011 -0400" }, "message": "Btrfs: convert to the new truncate sequence\n\n-\u003etruncate() is going away, instead all of the work needs to be done in\n-\u003esetattr(). So this converts us over to do this. It\u0027s fairly straightforward,\njust get rid of our .truncate inode operation and call btrfs_truncate() directly\nfrom btrfs_setsize. This works out better for us since truncate can technically\nreturn ENOSPC, and before we had no way of letting anybody know. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "dc89e9824464e91fa0b06267864ceabe3186fd8b", "tree": "82952195464518dce48cb613c74d2326f228669b", "parents": [ "57a45ced94fe48a701361d64230fc16eefa189dd" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Jan 28 17:05:48 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:20 2011 -0400" }, "message": "Btrfs: use a slab for the free space entries\n\nSince we alloc/free free space entries a whole lot, lets use a slab to keep\ntrack of them. This makes some of my tests slightly faster. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "57a45ced94fe48a701361d64230fc16eefa189dd", "tree": "8f0cfe52ba0b3fb8a6ed3cc5d3e7449369b0b9a5", "parents": [ "4a64001f0047956e283f7ada9843dfc3f3b5d8c8" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue Jan 25 16:30:38 2011 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Mar 17 14:21:18 2011 -0400" }, "message": "Btrfs: change reserved_extents to an atomic_t\n\nWe track delayed allocation per inodes via 2 counters, one is\noutstanding_extents and reserved_extents. Outstanding_extents is already an\natomic_t, but reserved_extents is not and is protected by a spinlock. So\nconvert this to an atomic_t and instead of using a spinlock, use atomic_cmpxchg\nwhen releasing delalloc bytes. This makes our inode 72 bytes smaller, and\nreduces locking overhead (albiet it was minimal to begin with). Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "0f6e0e8448a16d8d22119ce91d8dd24b44865b51", "tree": "7c295c02db035fc6a0b867465911a2bc9dc6b1ef", "parents": [ "0d2ecee2bdb2a19d04bc5cefac0f86e790f1aad4", "a002951c97ff8da49938c982a4c236bf2fafdc9f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 09:15:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 09:15:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (33 commits)\n AppArmor: kill unused macros in lsm.c\n AppArmor: cleanup generated files correctly\n KEYS: Add an iovec version of KEYCTL_INSTANTIATE\n KEYS: Add a new keyctl op to reject a key with a specified error code\n KEYS: Add a key type op to permit the key description to be vetted\n KEYS: Add an RCU payload dereference macro\n AppArmor: Cleanup make file to remove cruft and make it easier to read\n SELinux: implement the new sb_remount LSM hook\n LSM: Pass -o remount options to the LSM\n SELinux: Compute SID for the newly created socket\n SELinux: Socket retains creator role and MLS attribute\n SELinux: Auto-generate security_is_socket_class\n TOMOYO: Fix memory leak upon file open.\n Revert \"selinux: simplify ioctl checking\"\n selinux: drop unused packet flow permissions\n selinux: Fix packet forwarding checks on postrouting\n selinux: Fix wrong checks for selinux_policycap_netpeer\n selinux: Fix check for xfrm selinux context algorithm\n ima: remove unnecessary call to ima_must_measure\n IMA: remove IMA imbalance checking\n ...\n" }, { "commit": "422e6c4bc4b48c15b3cb57a1ca71431abfc57e54", "tree": "81ceb21f84a79e796ee33b5d17e17406f096abcb", "parents": [ "c83ce989cb5ff86575821992ea82c4df5c388ebc", "574197e0de46a8a4db5c54ef7b65e43ffa8873a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 15:48:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 15:48:13 2011 -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: (57 commits)\n tidy the trailing symlinks traversal up\n Turn resolution of trailing symlinks iterative everywhere\n simplify link_path_walk() tail\n Make trailing symlink resolution in path_lookupat() iterative\n update nd-\u003einode in __do_follow_link() instead of after do_follow_link()\n pull handling of one pathname component into a helper\n fs: allow AT_EMPTY_PATH in linkat(), limit that to CAP_DAC_READ_SEARCH\n Allow passing O_PATH descriptors via SCM_RIGHTS datagrams\n readlinkat(), fchownat() and fstatat() with empty relative pathnames\n Allow O_PATH for symlinks\n New kind of open files - \"location only\".\n ext4: Copy fs UUID to superblock\n ext3: Copy fs UUID to superblock.\n vfs: Export file system uuid via /proc/\u003cpid\u003e/mountinfo\n unistd.h: Add new syscalls numbers to asm-generic\n x86: Add new syscalls for x86_64\n x86: Add new syscalls for x86_32\n fs: Remove i_nlink check from file system link callback\n fs: Don\u0027t allow to create hardlink for deleted file\n vfs: Add open by file handle support\n ...\n" }, { "commit": "a002951c97ff8da49938c982a4c236bf2fafdc9f", "tree": "d43e7885ea7376df0a47a0fc8ceca66dc5bfa357", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d", "c151694b2c48d956ac8c8c59c6927f89cc29ef70" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Mar 16 09:41:17 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Mar 16 09:41:17 2011 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "f17b6042073e7000a90063f7edbca59a5bd1caa2", "tree": "e893485df882c770da602030c6c1098b11ea3d56", "parents": [ "aae8a97d3ec30788790d1720b71d76fd8eb44b73" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Sat Jan 29 18:43:30 2011 +0530" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 15 02:21:44 2011 -0400" }, "message": "fs: Remove i_nlink check from file system link callback\n\nNow that VFS check for inode-\u003ei_nlink \u003d\u003d 0 and returns proper\nerror, remove similar check from file system\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0e5b88cd9975dca6c191cc9bd11f233fac4ca882", "tree": "6302317acfb24d6b5ad7924aceaa0dd1c4a7a371", "parents": [ "eebea5d13d391981061d6ef069a841002eba4a7a", "36e39c40b3facc9b489a13f1d301fc53ff6960a3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 13 16:00:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 13 16:00:49 2011 -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: break out of shrink_delalloc earlier\n btrfs: fix not enough reserved space\n btrfs: fix dip leak\n Btrfs: make sure not to return overlapping extents to fiemap\n Btrfs: deal with short returns from copy_from_user\n Btrfs: fix regressions in copy_from_user handling\n" }, { "commit": "7e6b6465e6efbca3985258996be9c189da96c8bf", "tree": "d4cde91d45865effa20fca9a789813321808c129", "parents": [ "b4966b7770349deb05e3dd2bd2c65d2d044abbbb" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Fri Feb 18 09:21:17 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 10 11:21:49 2011 -0500" }, "message": "btrfs: fix not enough reserved space\n\nbtrfs_link() will insert 3 items(inode ref, dir name item and dir index item)\ninto the b+ tree and update 2 items(its inode, and parent\u0027s inode) in the b+\ntree. So we should reserve space for these 5 items, not 3 items.\n\nReported-by: Tsutomu Itoh \u003ct-itoh@jp.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": "b4966b7770349deb05e3dd2bd2c65d2d044abbbb", "tree": "79e281fde97b792eb732b5bde167c56939a6c67f", "parents": [ "ea8efc74bd0402b4d5f663d007b4e25fa29ea778" ], "author": { "name": "Daniel J Blueman", "email": "daniel.blueman@gmail.com", "time": "Wed Mar 09 16:46:42 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Mar 10 11:21:49 2011 -0500" }, "message": "btrfs: fix dip leak\n\nThe btrfs DIO code leaks dip structs when dip-\u003ecsums allocation\nfails; bio-\u003ebi_end_io isn\u0027t set at the point where the free_ordered\nbranch is consequently taken, thus bio_endio doesn\u0027t call the function\nwhich would free it in the normal case. Fix.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel.blueman@gmail.com\u003e\nAcked-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "4c63f5646e405b5010cc9499419060bf2e838f5b", "tree": "df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1", "parents": [ "cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24", "69d60eb96ae8a73cf9b79cf28051caf973006011" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "message": "Merge branch \u0027for-2.6.39/stack-plug\u0027 into for-2.6.39/core\n\nConflicts:\n\tblock/blk-core.c\n\tblock/blk-flush.c\n\tdrivers/md/raid1.c\n\tdrivers/md/raid10.c\n\tdrivers/md/raid5.c\n\tfs/nilfs2/btnode.c\n\tfs/nilfs2/mdt.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7eaceaccab5f40bbfda044629a6298616aeaed50", "tree": "33954d12f63e25a47eb6d86ef3d3d0a5e62bf752", "parents": [ "73c101011926c5832e6e141682180c4debe2cf45" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "message": "block: remove per-queue plugging\n\nCode has been converted over to the new explicit on-stack plugging,\nand delay users have been converted to use the new API for that.\nSo lets kill off the old plugging along with aops-\u003esync_page().\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "fe3fa43039d47ee4e22caf460b79b62a14937f79", "tree": "9eab8d00f1227b9fe0959f32a62d892ed35803ba", "parents": [ "ee009e4a0d4555ed522a631bae9896399674f064", "026eb167ae77244458fa4b4b9fc171209c079ba7" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 08 11:38:10 2011 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Mar 08 11:38:10 2011 +1100" }, "message": "Merge branch \u0027master\u0027 of git://git.infradead.org/users/eparis/selinux into next\n" }, { "commit": "4660ba63f1c4e07c20a435e084f12ba48a82bd2b", "tree": "494973a1dd4102eede20298f478574801af31b86", "parents": [ "958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61", "ec29ed5b407d618a8128f5942aade9e1758aa14b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 14:03:39 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 14:03:39 2011 -0800" }, "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 fiemap bugs with delalloc\n Btrfs: set FMODE_EXCL in btrfs_device-\u003emode\n Btrfs: make btrfs_rm_device() fail gracefully\n Btrfs: Avoid accessing unmapped kernel address\n Btrfs: Fix BTRFS_IOC_SUBVOL_SETFLAGS ioctl\n Btrfs: allow balance to explicitly allocate chunks as it relocates\n Btrfs: put ENOSPC debugging under a mount option\n" }, { "commit": "ec29ed5b407d618a8128f5942aade9e1758aa14b", "tree": "19b3c13f15504cf9de116f0bd55045ebcf0d0cfc", "parents": [ "fb01aa85b8b29c1a4e1f4a28ea54175de6bf7559" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed Feb 23 16:23:20 2011 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed Feb 23 16:23:20 2011 -0500" }, "message": "Btrfs: fix fiemap bugs with delalloc\n\nThe Btrfs fiemap code wasn\u0027t properly returning delalloc extents,\nso applications that trust fiemap to decide if there are holes in the\nfile see holes instead of delalloc.\n\nThis reworks the btrfs fiemap code, adding a get_extent helper that\nsearches for delalloc ranges and also adding a helper for extent_fiemap\nthat skips past holes in the file.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "007a14af2649c9ac77f38cd23469518ffb8b355a", "tree": "d6bc4477c11d7c8fd892f059acf0fc1ed547ba52", "parents": [ "261cd298a8c363d7985e3482946edb4bfedacf98", "c26a920373a983b52223eed5a13b97404d8b4158" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 08:00:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 15 08:00:35 2011 -0800" }, "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 return value of alloc_extent_map()\n Btrfs - Fix memory leak in btrfs_init_new_device()\n btrfs: prevent heap corruption in btrfs_ioctl_space_info()\n Btrfs: Fix balance panic\n Btrfs: don\u0027t release pages when we can\u0027t clear the uptodate bits\n Btrfs: fix page-\u003eprivate races\n" }, { "commit": "c26a920373a983b52223eed5a13b97404d8b4158", "tree": "a7f76fe1b0cecbc712f0b152ff537805f126b113", "parents": [ "67100f255dba284bcbb5ce795355dad1cff35658" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Mon Feb 14 00:45:29 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Feb 14 16:21:37 2011 -0500" }, "message": "Btrfs: check return value of alloc_extent_map()\n\nI add the check on the return value of alloc_extent_map() to several places.\nIn addition, alloc_extent_map() returns only the address or NULL.\nTherefore, check by IS_ERR() is unnecessary. So, I remove IS_ERR() checking.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "cb5520f02c010e3cb974b9ac06f30aafa2eebc38", "tree": "8342407cebb6420f04f46694b8d812552a14cb49", "parents": [ "eee4da2cef8e2dc2b15066e9ebb5b2ff63396eb3", "3a90983dbdcb2f4f48c0d771d8e5b4d88f27fae6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 07 14:06:18 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 07 14:06:18 2011 -0800" }, "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: (33 commits)\n Btrfs: Fix page count calculation\n btrfs: Drop __exit attribute on btrfs_exit_compress\n btrfs: cleanup error handling in btrfs_unlink_inode()\n Btrfs: exclude super blocks when we read in block groups\n Btrfs: make sure search_bitmap finds something in remove_from_bitmap\n btrfs: fix return value check of btrfs_start_transaction()\n btrfs: checking NULL or not in some functions\n Btrfs: avoid uninit variable warnings in ordered-data.c\n Btrfs: catch errors from btrfs_sync_log\n Btrfs: make shrink_delalloc a little friendlier\n Btrfs: handle no memory properly in prepare_pages\n Btrfs: do error checking in btrfs_del_csums\n Btrfs: use the global block reserve if we cannot reserve space\n Btrfs: do not release more reserved bytes to the global_block_rsv than we need\n Btrfs: fix check_path_shared so it returns the right value\n btrfs: check return value of btrfs_start_ioctl_transaction() properly\n btrfs: fix return value check of btrfs_join_transaction()\n fs/btrfs/inode.c: Add missing IS_ERR test\n btrfs: fix missing break in switch phrase\n btrfs: fix several uncheck memory allocations\n ...\n" }, { "commit": "554233a6e0e8557e8e81e54cc70628d101291122", "tree": "9cd7c8fe5dddbdd7255192468daa9cc9a48ea208", "parents": [ "3c14874acc71180553fb5aba528e3cf57c5b958b" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Thu Feb 03 03:16:25 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Feb 06 07:17:45 2011 -0500" }, "message": "btrfs: cleanup error handling in btrfs_unlink_inode()\n\nWhen btrfs_alloc_path() fails, btrfs_free_path() need not be called.\nTherefore, it changes the branch ahead.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2a7dba391e5628ad665ce84ef9a6648da541ebab", "tree": "ba0722bd74d2c883dbda7ff721850bab411cac04", "parents": [ "821404434f3324bf23f545050ff64055a149766e" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Feb 01 11:05:39 2011 -0500" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Feb 01 11:12:29 2011 -0500" }, "message": "fs/vfs/security: pass last path component to LSM on inode creation\n\nSELinux would like to implement a new labeling behavior of newly created\ninodes. We currently label new inodes based on the parent and the creating\nprocess. This new behavior would also take into account the name of the\nnew object when deciding the new label. This is not the (supposed) full path,\njust the last component of the path.\n\nThis is very useful because creating /etc/shadow is different than creating\n/etc/passwd but the kernel hooks are unable to differentiate these\noperations. We currently require that userspace realize it is doing some\ndifficult operation like that and than userspace jumps through SELinux hoops\nto get things set up correctly. This patch does not implement new\nbehavior, that is obviously contained in a seperate SELinux patch, but it\ndoes pass the needed name down to the correct LSM hook. If no such name\nexists it is fine to pass NULL.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "98d5dc13e7e74b77ca3b4c3cbded9f48d2dbbbb7", "tree": "8e75f67b28b5b0d909483a06bb5258e0ba0c9789", "parents": [ "5df67083488ccbad925f583b698ab38f8629a016" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Thu Jan 20 06:19:37 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Tue Feb 01 07:17:27 2011 -0500" }, "message": "btrfs: fix return value check of btrfs_start_transaction()\n\nThe error check of btrfs_start_transaction() is added, and the mistake\nof the error check on several places is corrected.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "dedefd7215d3ec451291ca393e5c8e4c1882c8c6", "tree": "45ab482f3fa6896fc63051c356399d45e5ea8140", "parents": [ "abd30bb0af9d4671506502278e8631bed9e3c35c" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jan 24 21:43:18 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 28 16:40:37 2011 -0500" }, "message": "Btrfs: fix check_path_shared so it returns the right value\n\nWhen running xfstests 224 I kept getting ENOSPC when trying to remove the files,\nand this is because we were returning ret from check_path_shared while it was\nuninitalized, which isn\u0027t right. Fix this to return 0 properly, and now\nxfstests 224 doesn\u0027t freak out when it tries to clean itself up. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3612b49598c303cfb22a4b609427f829828e2427", "tree": "d0e9eabb176777ab80af5d78eab0555044172370", "parents": [ "34d19bada00f4825588b338a8ee193820f9ceeb0" ], "author": { "name": "Tsutomu Itoh", "email": "t-itoh@jp.fujitsu.com", "time": "Tue Jan 25 02:51:38 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 28 16:40:37 2011 -0500" }, "message": "btrfs: fix return value check of btrfs_join_transaction()\n\nThe error check of btrfs_join_transaction()/btrfs_join_transaction_nolock()\nis added, and the mistake of the error check in several places is\ncorrected.\n\nFor more stable Btrfs, I think that we should reduce BUG_ON().\nBut, I think that long time is necessary for this.\nSo, I propose this patch as a short-term solution.\n\nWith this patch:\n - To more stable Btrfs, the part that should be corrected is clarified.\n - The panic isn\u0027t done by the NULL pointer reference etc. (even if\n BUG_ON() is increased temporarily)\n - The error code is returned in the place where the error can be easily\n returned.\n\nAs a long-term plan:\n - BUG_ON() is reduced by using the forced-readonly framework, etc.\n\nSigned-off-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "34d19bada00f4825588b338a8ee193820f9ceeb0", "tree": "878be53a548cfc3b2bf653ab33f4431691ca9646", "parents": [ "333e8105445d4f51101fc3d23199a919d66730b3" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Mon Jan 24 19:55:19 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 28 16:40:37 2011 -0500" }, "message": "fs/btrfs/inode.c: Add missing IS_ERR test\n\nAfter the conditional that precedes the following code, inode may be an\nERR_PTR value. This can eg result from a memory allocation failure via the\ncall to btrfs_iget, and thus does not imply that root is different than\nsub_root. Thus, an IS_ERR check is added to ensure that there is no\ndereference of inode in this case.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r@\nidentifier f;\n@@\nf(...) { ... return ERR_PTR(...); }\n\n@@\nidentifier r.f, fld;\nexpression x;\nstatement S1,S2;\n@@\n x \u003d f(...)\n ... when !\u003d IS_ERR(x)\n(\n if (IS_ERR(x) ||...) S1 else S2\n|\n*x-\u003efld\n)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "eab49bec41136460b12ac0fbeceeb88386d538c7", "tree": "d2ad3e163407d7779d53fdaa0dedcc3b934106de", "parents": [ "acce952b0263825da32cf10489413dec78053347", "4d728ec7aefdca5419d2ebfb28c147e81a4b59f4" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 28 16:24:59 2011 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 28 16:24:59 2011 -0500" }, "message": "Merge branch \u0027bug-fixes\u0027 of git://repo.or.cz/linux-btrfs-devel into btrfs-38\n" }, { "commit": "b897abec032deb7cc3ce67392a1f544ac965ddea", "tree": "9014f850ad04b51953ae010713605a758bd1bb63", "parents": [ "d0f69686c2ae775529aadc7a8acc6f13ad41de66" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Wed Jan 26 16:19:22 2011 +0800" }, "committer": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Jan 27 01:10:30 2011 +0800" }, "message": "Btrfs: Fix memory leak in writepage fixup work\n\nfixup, which is allocated when starting page write to fix up the\nextent without ORDERED bit set, should be freed after this work\nis done.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "eee2a817df7c5a6e569f353f8be78cc1b3604bb6", "tree": "f721beb4712c732702d3383d3c6a52da8b5bbb20", "parents": [ "83896fb5e51594281720d145164f866ba769abd5", "acce952b0263825da32cf10489413dec78053347" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 14:43:43 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 17 14:43:43 2011 -0800" }, "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: (25 commits)\n Btrfs: forced readonly mounts on errors\n btrfs: Require CAP_SYS_ADMIN for filesystem rebalance\n Btrfs: don\u0027t warn if we get ENOSPC in btrfs_block_rsv_check\n btrfs: Fix memory leak in btrfs_read_fs_root_no_radix()\n btrfs: check NULL or not\n btrfs: Don\u0027t pass NULL ptr to func that may deref it.\n btrfs: mount failure return value fix\n btrfs: Mem leak in btrfs_get_acl()\n btrfs: fix wrong free space information of btrfs\n btrfs: make the chunk allocator utilize the devices better\n btrfs: restructure find_free_dev_extent()\n btrfs: fix wrong calculation of stripe size\n btrfs: try to reclaim some space when chunk allocation fails\n btrfs: fix wrong data space statistics\n fs/btrfs: Fix build of ctree\n Btrfs: fix off by one while setting block groups readonly\n Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls\n Btrfs: Add readonly snapshots support\n Btrfs: Refactor btrfs_ioctl_snap_create()\n btrfs: Extract duplicate decompress code\n ...\n" }, { "commit": "2fe17c1075836b66678ed2a305fd09b6773883aa", "tree": "eb5287be8138686682eef9622872cfc7657e0664", "parents": [ "64c23e86873ee410554d6d1c76b60da47025e96f" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Fri Jan 14 13:07:43 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 17 02:25:31 2011 -0500" }, "message": "fallocate should be a file operation\n\nCurrently all filesystems except XFS implement fallocate asynchronously,\nwhile XFS forced a commit. Both of these are suboptimal - in case of O_SYNC\nI/O we really want our allocation on disk, especially for the !KEEP_SIZE\ncase where we actually grow the file with user-visible zeroes. On the\nother hand always commiting the transaction is a bad idea for fast-path\nuses of fallocate like for example in recent Samba versions. Given\nthat block allocation is a data plane operation anyway change it from\nan inode operation to a file operation so that we have the file structure\navailable that lets us check for O_SYNC.\n\nThis also includes moving the code around for a few of the filesystems,\nand remove the already unnedded S_ISDIR checks given that we only wire\nup fallocate for regular files.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "64c23e86873ee410554d6d1c76b60da47025e96f", "tree": "b30c5ff8782ebfdec6956d7834f796731fd3a1d4", "parents": [ "eb745dbccce56f1bbe3f80b95ad2a325145171c2" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Fri Jan 14 13:07:30 2011 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 17 02:25:30 2011 -0500" }, "message": "make the feature checks in -\u003efallocate future proof\n\nInstead of various home grown checks that might need updates for new\nflags just check for any bit outside the mask of the features supported\nby the filesystem. This makes the check future proof for any newly\nadded flag.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f892436eb2c3223fecda614a64d51f36f6ec2245", "tree": "75001db8c8b7fad547cbd4e99494727287598c1c", "parents": [ "26c79f6ba0ccdc4bbc8ef8721406d37e9178e30b", "3a39c18d63fec35f49df577d4b2a4e29c2212f22" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Jan 16 11:25:54 2011 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Jan 16 11:25:54 2011 -0500" }, "message": "Merge branch \u0027lzo-support\u0027 of git://repo.or.cz/linux-btrfs-devel into btrfs-38\n" }, { "commit": "23a8519b55235660f6fb7d6f394a912de9d23208", "tree": "7df68ca9459ccc15cb40902a3c9c8b62b710aefa", "parents": [ "d6dc8462f471f7bbb49c42c147bf84de0c977099" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Wed Nov 17 20:46:19 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jan 12 20:16:44 2011 -0500" }, "message": "Btrfs: fail if we try to use hole punch\n\nBtrfs doesn\u0027t have the ability to punch holes yet, so make sure we return\nEOPNOTSUPP if we try to use hole punching through fallocate. This support can\nbe added later. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "af53d29ac13a97304d44343dc3b26154ca595268", "tree": "6ed2ca27a8d9d1d04b3df839273f36c896cf370e", "parents": [ "ba87167c06ed0049260d9ca36405c0f8af609e07" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Dec 20 10:56:06 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jan 12 20:02:47 2011 -0500" }, "message": "switch btrfs, close races\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "258a5aa8dfc6294f5f7df892023ee4d3e57c9841", "tree": "101a4b9ee97f7d838b35a906244085873c599d19", "parents": [ "73598611ade7c85f0c3d52ba5130103f6709c6d3" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:01 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:30 2011 +1100" }, "message": "btrfs: provide simple rcu-walk ACL implementation\n\nThis simple implementation just checks for no ACLs on the inode, and\nif so, then the rcu-walk may proceed, otherwise fail it.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "b74c79e99389cd79b31fcc08f82c24e492e63c7e", "tree": "763c6b412517306670bc625e90035f2d16bb739f", "parents": [ "34286d6662308d82aed891852d04c7c3a2649b16" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:58 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:29 2011 +1100" }, "message": "fs: provide rcu-walk aware permission i_ops\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "fb045adb99d9b7c562dc7fef834857f78249daa1", "tree": "1fd6a4024fffeec568abe100d730589bfdb81c38", "parents": [ "5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:55 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:28 2011 +1100" }, "message": "fs: dcache reduce branches in lookup path\n\nReduce some branches and memory accesses in dcache lookup by adding dentry\nflags to indicate common d_ops are set, rather than having to check them.\nThis saves a pointer memory access (dentry-\u003ed_op) in common path lookup\nsituations, and saves another pointer load and branch in cases where we\nhave d_op but not the particular operation.\n\nPatched with:\n\ngit grep -E \u0027[.\u003e]([[:space:]])*d_op([[:space:]])*\u003d\u0027 | xargs sed -e \u0027s/\\([^\\t ]*\\)-\u003ed_op \u003d \\(.*\\);/d_set_d_op(\\1, \\2);/\u0027 -e \u0027s/\\([^\\t ]*\\)\\.d_op \u003d \\(.*\\);/d_set_d_op(\\\u0026\\1, \\2);/\u0027 -i\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9", "tree": "203e0f73883e4c26b5597e36042386a1237dab35", "parents": [ "77812a1ef139d84270d27faacc0630c887411013" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:49 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:26 2011 +1100" }, "message": "fs: icache RCU free inodes\n\nRCU free the struct inode. This will allow:\n\n- Subsequent store-free path walking patch. The inode must be consulted for\n permissions when walking, so an RCU inode reference is a must.\n- sb_inode_list_lock to be moved inside i_lock because sb list walkers who want\n to take i_lock no longer need to take sb_inode_list_lock to walk the list in\n the first place. This will simplify and optimize locking.\n- Could remove some nested trylock loops in dcache code\n- Could potentially simplify things a bit in VM land. Do not need to take the\n page lock to follow page-\u003emapping.\n\nThe downsides of this is the performance cost of using RCU. In a simple\ncreat/unlink microbenchmark, performance drops by about 10% due to inability to\nreuse cache-hot slab objects. As iterations increase and RCU freeing starts\nkicking over, this increases to about 20%.\n\nIn cases where inode lifetimes are longer (ie. many inodes may be allocated\nduring the average life span of a single inode), a lot of this cache reuse is\nnot applicable, so the regression caused by this patch is smaller.\n\nThe cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU,\nhowever this adds some complexity to list walking and store-free path walking,\nso I prefer to implement this at a later date, if it is shown to be a win in\nreal situations. I haven\u0027t found a regression in any non-micro benchmark so I\ndoubt it will be a problem.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "fe15ce446beb3a33583af81ffe6c9d01a75314ed", "tree": "bc8af66b6dd2d0f21a2a3f48a19975ae2cdbae4e", "parents": [ "5eef7fa905c814826f518aca2d414ca77508ce30" ], "author": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:49:23 2011 +1100" }, "committer": { "name": "Nick Piggin", "email": "npiggin@kernel.dk", "time": "Fri Jan 07 17:50:18 2011 +1100" }, "message": "fs: change d_delete semantics\n\nChange d_delete from a dentry deletion notification to a dentry caching\nadvise, more like -\u003edrop_inode. Require it to be constant and idempotent,\nand not take d_lock. This is how all existing filesystems use the callback\nanyway.\n\nThis makes fine grained dentry locking of dput and dentry lru scanning\nmuch simpler.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@kernel.dk\u003e\n" }, { "commit": "b83cc9693f39689490970c19f6c5b866f6719a70", "tree": "b86d09884015fce195a4ac5ff1e8ec5f6ec00677", "parents": [ "fa0d2b9bd717340e0bc4850a80ac0eb344e9a7fb" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Dec 20 16:04:08 2010 +0800" }, "committer": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Dec 23 08:49:17 2010 +0800" }, "message": "Btrfs: Add readonly snapshots support\n\nUsage:\n\nSet BTRFS_SUBVOL_RDONLY of btrfs_ioctl_vol_arg_v2-\u003eflags, and call\nioctl(BTRFS_I0CTL_SNAP_CREATE_V2).\n\nImplementation:\n\n- Set readonly bit of btrfs_root_item-\u003eflags.\n- Add readonly checks in btrfs_permission (inode_permission),\nbtrfs_setattr, btrfs_set/remove_xattr and some ioctls.\n\nChangelog for v3:\n\n- Eliminate btrfs_root-\u003ereadonly, but check btrfs_root-\u003eroot_item.flags.\n- Rename BTRFS_ROOT_SNAP_RDONLY to BTRFS_ROOT_SUBVOL_RDONLY.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "261507a02ccba9afda919852263b6bc1581ce1ef", "tree": "c16bc657ff4e29a87042ceb379487f24dff01035", "parents": [ "4b72029dc3fd6ba7dc45ccd1cf0aa0ebfa209bd3" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Dec 17 14:21:50 2010 +0800" }, "committer": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Wed Dec 22 23:15:45 2010 +0800" }, "message": "btrfs: Allow to add new compression algorithm\n\nMake the code aware of compression type, instead of always assuming\nzlib compression.\n\nAlso make the zlib workspace function as common code for all\ncompression types.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "e13cf63f2bbd38721af557f0205da994ea068427", "tree": "26d0d779fadd58814eea18ab2b16370a8565c837", "parents": [ "073f21ae1319348f4f8630003b7901e3be254327", "83a50de97fe96aca82389e061862ed760ece2283" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 11:08:13 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 14 11:08:13 2010 -0800" }, "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: prevent RAID level downgrades when space is low\n Btrfs: account for missing devices in RAID allocation profiles\n Btrfs: EIO when we fail to read tree roots\n Btrfs: fix compiler warnings\n Btrfs: Make async snapshot ioctl more generic\n Btrfs: pwrite blocked when writing from the mmaped buffer of the same page\n Btrfs: Fix a crash when mounting a subvolume\n Btrfs: fix sync subvol/snapshot creation\n Btrfs: Fix page leak in compressed writeback path\n Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots\n Btrfs: fixup return code for btrfs_del_orphan_item\n Btrfs: do not do fast caching if we are allocating blocks for tree_root\n Btrfs: deal with space cache errors better\n Btrfs: fix use after free in O_DIRECT\n" }, { "commit": "3dd1462e82bcab7625cec129952f26dae7a8b742", "tree": "0e4da87e5de3c71613ab6a6470b5c16d03c793a4", "parents": [ "fdfb1e4f6c61477a61890b64974d65cdc3a98702" ], "author": { "name": "Jan Beulich", "email": "jbeulich@novell.com", "time": "Tue Dec 07 14:54:09 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Dec 10 16:29:11 2010 -0500" }, "message": "Btrfs: fix compiler warnings\n\n... regarding an unused function when !MIGRATION, and regarding a\nprintk() format string vs argument mismatch.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "24ae63656a165c870c0d69fcc8aac1dc35e25e34", "tree": "8833bfeba51ef45e0acc42f3a23838f528e6a37e", "parents": [ "84cd948cb11041f205242de457e680b9bb872a36" ], "author": { "name": "Yan, Zheng", "email": "zheng.z.yan@linux.intel.com", "time": "Mon Dec 06 07:02:36 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Dec 10 16:29:09 2010 -0500" }, "message": "Btrfs: Fix page leak in compressed writeback path\n\n\"start + num_bytes \u003e\u003d actual_end\" can happen when compressed page writeback races\nwith file truncation. In that case we need unlock and release pages past the end\nof file.\n\nSigned-off-by: Yan, Zheng \u003czheng.z.yan@intel.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "955256f2c3e25c94ad373c43fbc38d2ac8af2a71", "tree": "f8a6074a34e988e613eb308d4aeb91fd8fb2e968", "parents": [ "5a92bc88cef279261d3f138e25850c122df67045" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Nov 19 09:41:10 2010 -0500" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Dec 09 13:57:10 2010 -0500" }, "message": "Btrfs: fix use after free in O_DIRECT\n\nThis fixes a bug where we use dip after we have freed it. Instead just use the\nfile_offset that was passed to the function. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "aa3fc52546b847f590d86a093afd863ff9081628", "tree": "9d8b35a700287ae19fb3baa0e9f2c93462795d11", "parents": [ "555bdaefd52c386e79f98591810ceb8bab780398", "5a92bc88cef279261d3f138e25850c122df67045" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 29 14:11:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 29 14:11:08 2010 -0800" }, "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: (24 commits)\n Btrfs: don\u0027t use migrate page without CONFIG_MIGRATION\n Btrfs: deal with DIO bios that span more than one ordered extent\n Btrfs: setup blank root and fs_info for mount time\n Btrfs: fix fiemap\n Btrfs - fix race between btrfs_get_sb() and umount\n Btrfs: update inode ctime when using links\n Btrfs: make sure new inode size is ok in fallocate\n Btrfs: fix typo in fallocate to make it honor actual size\n Btrfs: avoid NULL pointer deref in try_release_extent_buffer\n Btrfs: make btrfs_add_nondir take parent inode as an argument\n Btrfs: hold i_mutex when calling btrfs_log_dentry_safe\n Btrfs: use dget_parent where we can UPDATED\n Btrfs: fix more ESTALE problems with NFS\n Btrfs: handle NFS lookups properly\n btrfs: make 1-bit signed fileds unsigned\n btrfs: Show device attr correctly for symlinks\n btrfs: Set file size correctly in file clone\n btrfs: Check if dest_offset is block-size aligned before cloning file\n Btrfs: handle the space_cache option properly\n btrfs: Fix early enospc because \u0027unused\u0027 calculated with wrong sign.\n ...\n" }, { "commit": "163cf09c2a0ee5cac6285f9347975bd1e97725da", "tree": "5a83cd42d57fcc4d92d12965b5eafdb472e89b02", "parents": [ "450ba0ea06b6ed3612d27f2b7127a9de4160f285" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 28 19:56:33 2010 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 28 19:56:33 2010 -0500" }, "message": "Btrfs: deal with DIO bios that span more than one ordered extent\n\nThe new DIO bio splitting code has problems when the bio\nspans more than one ordered extent. This will happen as the\ngeneric DIO code merges our get_blocks calls together into\na bigger single bio.\n\nThis fixes things by walking forward in the ordered extent\ncode finding all the overlapping ordered extents and completing them\nall at once.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "bc1cbf1f86aa2501efa9ca637c736fce6bcc4b1d", "tree": "af17fcd439f67eafc534e894168b397c563e2366", "parents": [ "0ed42a63f3edb144b091d9528401fce95c3c4d8d" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue Nov 23 19:50:59 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Nov 27 13:00:07 2010 -0500" }, "message": "Btrfs: update inode ctime when using links\n\nCurrently we fail xfstest 236 because we\u0027re not updating the inode ctime on\nlink. This is a simple fix, and makes it so we pass 236 now.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0ed42a63f3edb144b091d9528401fce95c3c4d8d", "tree": "d98573473d916eecbeb949d45f8ac9b530440080", "parents": [ "55a61d1d06a3dc443d0db8aaa613365dcb83b98a" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Nov 22 18:55:39 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Nov 27 13:00:07 2010 -0500" }, "message": "Btrfs: make sure new inode size is ok in fallocate\n\nWe have been failing xfstest 228 forever, because we don\u0027t check to make sure\nthe new inode size is acceptable as far as RLIMIT is concerned. Just check to\nmake sure it\u0027s ok to create a inode with this new size and error out if not.\nWith this patch we now pass 228.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "55a61d1d06a3dc443d0db8aaa613365dcb83b98a", "tree": "39f59ec200674081b086f9e25393401d08848ffd", "parents": [ "45f49bce99d008d6864a20324548f35936ba46fb" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Nov 22 18:50:32 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Nov 27 12:59:16 2010 -0500" }, "message": "Btrfs: fix typo in fallocate to make it honor actual size\n\nThere is a typo in __btrfs_prealloc_file_range() where we set the i_size to\nactual_len/cur_offset, and then just set it to cur_offset again, and do the same\nwith btrfs_ordered_update_i_size(). This fixes it back to keeping i_size in a\nlocal variable and then updating i_size properly. Tested this with\n\nxfs_io -F -f -c \"falloc 0 1\" -c \"pwrite 0 1\" foo\n\nstat\u0027ing foo gives us a size of 1 instead of 4096 like it was. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "a1b075d28da563c5e2325577f282c042494254ba", "tree": "0699a0490e11efb6fc2b1a2e99fa6419e9e568fa", "parents": [ "495e86779f4f319828bc10dfc0c9ac2161868077" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Nov 19 20:36:11 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:10 2010 -0500" }, "message": "Btrfs: make btrfs_add_nondir take parent inode as an argument\n\nEverybody who calls btrfs_add_nondir just passes in the dentry of the new file\nand then dereference dentry-\u003ed_parent-\u003ed_inode, but everybody who calls\nbtrfs_add_nondir() are already passed the parent\u0027s inode. So instead of\ndereferencing dentry-\u003ed_parent, just make btrfs_add_nondir take the dir inode as\nan argument and pass that along so we don\u0027t have to worry about d_parent.\nThanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6a912213046ecb6511fdf35531a0c7de3de963c9", "tree": "b745a07d0ad5c5bedf68c55739200093f9d96c1b", "parents": [ "76195853903ca613ba722203db9b747d70478fc7" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Sat Nov 20 09:48:00 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:09 2010 -0500" }, "message": "Btrfs: use dget_parent where we can UPDATED\n\nThere are lots of places where we do dentry-\u003ed_parent-\u003ed_inode without holding\nthe dentry-\u003ed_lock. This could cause problems with rename. So instead we need\nto use dget_parent() and hold the reference to the parent as long as we are\ngoing to use it\u0027s inode and then dput it at the end.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nCc: raven@themaw.net\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "76195853903ca613ba722203db9b747d70478fc7", "tree": "d3c7af7f141566a1ca2acfdf1efccd374b5e349f", "parents": [ "2ede0daf01549cecf4bb0962c46dc47382047523" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Nov 19 02:18:02 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:08 2010 -0500" }, "message": "Btrfs: fix more ESTALE problems with NFS\n\nWhen creating new inodes we don\u0027t setup inode-\u003ei_generation. So if we generate\nan fh with a newly created inode we save the generation of 0, but if we flush\nthe inode to disk and have to read it back when getting the inode on the server\nwe\u0027ll have the right i_generation, so gens wont match and we get ESTALE. This\npatch properly sets inode-\u003ei_generation when we create the new inode and now I\u0027m\nno longer getting ESTALE. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "f209561ad83c5ffd561dc4bc3a3c90b704fe9231", "tree": "9241e4251c8e73cdbb8b9e4abf279afd61694a8d", "parents": [ "5f3888ff6f0b9dce60705765752b788a92557644" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Nov 19 02:05:24 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:07 2010 -0500" }, "message": "btrfs: Show device attr correctly for symlinks\n\nSymlinks and files of other types show different device numbers, though\nthey are on the same partition:\n\n $ touch tmp; ln -s tmp tmp2; stat tmp tmp2\n File: `tmp\u0027\n Size: 0 \tBlocks: 0 IO Block: 4096 regular empty file\n Device: 15h/21d\tInode: 984027 Links: 1\n --- snip ---\n File: `tmp2\u0027 -\u003e `tmp\u0027\n Size: 3 \tBlocks: 0 IO Block: 4096 symbolic link\n Device: 13h/19d\tInode: 984028 Links: 1\n\nReported-by: Toke Høiland-Jørgensen \u003ctoke@toke.dk\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "e65e1535542931e51189832264cd282e5899e4b9", "tree": "cc3cda0f658cad9f69c351d0735150958a1b0147", "parents": [ "88f794ede7fadd4b63135b94d1561c1f2d5eb5f5" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Mon Nov 22 03:04:43 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:04 2010 -0500" }, "message": "btrfs: fix panic caused by direct IO\n\nbtrfs paniced when we write \u003e64KB data by direct IO at one time.\n\nReproduce steps:\n # mkfs.btrfs /dev/sda5 /dev/sda6\n # mount /dev/sda5 /mnt\n # dd if\u003d/dev/zero of\u003d/mnt/tmpfile bs\u003d100K count\u003d1 oflag\u003ddirect\n\nThen btrfs paniced:\nmapping failed logical 1103155200 bio len 69632 len 12288\n------------[ cut here ]------------\nkernel BUG at fs/btrfs/volumes.c:3010!\n[SNIP]\nPid: 1992, comm: btrfs-worker-0 Not tainted 2.6.37-rc1 #1 D2399/PRIMERGY\nRIP: 0010:[\u003cffffffffa03d1462\u003e] [\u003cffffffffa03d1462\u003e] btrfs_map_bio+0x202/0x210 [btrfs]\n[SNIP]\nCall Trace:\n [\u003cffffffffa03ab3eb\u003e] __btrfs_submit_bio_done+0x1b/0x20 [btrfs]\n [\u003cffffffffa03a35ff\u003e] run_one_async_done+0x9f/0xb0 [btrfs]\n [\u003cffffffffa03d3d20\u003e] run_ordered_completions+0x80/0xc0 [btrfs]\n [\u003cffffffffa03d45a4\u003e] worker_loop+0x154/0x5f0 [btrfs]\n [\u003cffffffffa03d4450\u003e] ? worker_loop+0x0/0x5f0 [btrfs]\n [\u003cffffffffa03d4450\u003e] ? worker_loop+0x0/0x5f0 [btrfs]\n [\u003cffffffff81083216\u003e] kthread+0x96/0xa0\n [\u003cffffffff8100cec4\u003e] kernel_thread_helper+0x4/0x10\n [\u003cffffffff81083180\u003e] ? kthread+0x0/0xa0\n [\u003cffffffff8100cec0\u003e] ? kernel_thread_helper+0x0/0x10\n\nWe fix this problem by splitting bios when we submit bios.\n\nReported-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nTested-by: Tsutomu Itoh \u003ct-itoh@jp.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0c56fa9662927354255f2f64617d1de61fc03db9", "tree": "d3e4afe5596c6ac844b8f84fbb5cd89c9a8d0cf8", "parents": [ "784b4e29a26617589edd290dd2919735e190c06e" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Mon Nov 22 03:01:39 2010 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sun Nov 21 22:26:02 2010 -0500" }, "message": "btrfs: fix free dip and dip-\u003ecsums twice\n\nbio_endio() will free dip and dip-\u003ecsums, so dip and dip-\u003ecsums twice will\nbe freed twice. Fix it.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "925d169f5b86fe57e2f5264ea574cce9a89b719d", "tree": "241d3156b427c6398bd3fc5efa9108635d0e189b", "parents": [ "cdf01dd5443d0befc8c6a32cb2e3d2f568fd2558", "6418c96107a2b399848bb8cfc6e29f11ca74fb94" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 30 09:05:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 30 09:05:48 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: (39 commits)\n Btrfs: deal with errors from updating the tree log\n Btrfs: allow subvol deletion by unprivileged user with -o user_subvol_rm_allowed\n Btrfs: make SNAP_DESTROY async\n Btrfs: add SNAP_CREATE_ASYNC ioctl\n Btrfs: add START_SYNC, WAIT_SYNC ioctls\n Btrfs: async transaction commit\n Btrfs: fix deadlock in btrfs_commit_transaction\n Btrfs: fix lockdep warning on clone ioctl\n Btrfs: fix clone ioctl where range is adjacent to extent\n Btrfs: fix delalloc checks in clone ioctl\n Btrfs: drop unused variable in block_alloc_rsv\n Btrfs: cleanup warnings from gcc 4.6 (nonbugs)\n Btrfs: Fix variables set but not read (bugs found by gcc 4.6)\n Btrfs: Use ERR_CAST helpers\n Btrfs: use memdup_user helpers\n Btrfs: fix raid code for removing missing drives\n Btrfs: Switch the extent buffer rbtree into a radix tree\n Btrfs: restructure try_release_extent_buffer()\n Btrfs: use the flusher threads for delalloc throttling\n Btrfs: tune the chunk allocation to 5% of the FS as metadata\n ...\n\nFix up trivial conflicts in fs/btrfs/super.c and fs/fs-writeback.c, and\nremove use of INIT_RCU_HEAD in fs/btrfs/extent_io.c (that init macro was\nuseless and removed in commit 5e8067adfdba: \"rcu head remove init\")\n" }, { "commit": "6418c96107a2b399848bb8cfc6e29f11ca74fb94", "tree": "38064798bde148760a7a3b555c0eb097bfd29fb2", "parents": [ "4260f7c7516f4c209cf0ca34fda99cc9a0847772" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Oct 30 07:34:24 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Sat Oct 30 07:34:24 2010 -0400" }, "message": "Btrfs: deal with errors from updating the tree log\n\nDuring unlink we remove any references to the inode from\nthe tree log. It can return -ENOENT and other errors,\nand this changes the unlink code to deal with it.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "559af8211433b8c0b20e6c43c61409cb9c9c2996", "tree": "702ebd4c4f5b610daa36f65d814a518356a9a46b", "parents": [ "411fc6bcef54f828a5458f4730c68abdf13c6bf0" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Oct 29 15:14:37 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Oct 29 15:14:37 2010 -0400" }, "message": "Btrfs: cleanup warnings from gcc 4.6 (nonbugs)\n\nThese are all the cases where a variable is set, but not read which are\nnot bugs as far as I can see, but simply leftovers.\n\nStill needs more review.\n\nFound by gcc 4.6\u0027s new warnings\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "411fc6bcef54f828a5458f4730c68abdf13c6bf0", "tree": "89b91cd7e0d7633e9d6e386e388bd0493165f66c", "parents": [ "d0b678cb0a26783ab7238784f1e7e608e5caafa3" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Oct 29 15:14:31 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Oct 29 15:14:31 2010 -0400" }, "message": "Btrfs: Fix variables set but not read (bugs found by gcc 4.6)\n\nThese are all the cases where a variable is set, but not\nread which are really bugs.\n\n- Couple of incorrect error handling fixed.\n- One incorrect use of a allocation policy\n- Some other things\n\nStill needs more review.\n\nFound by gcc 4.6\u0027s new warnings.\n\n[akpm@linux-foundation.org: fix build. Might have been bitrot]\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6b5b817f103450444f3f658a498f435d92a197e5", "tree": "2896588127c4dd6c2867ef09e7e3cdd83391f8ae", "parents": [ "8216ef866df1119fd5a72372b8b29bce49c18590", "e9bb7f10d3617304ef94ff7aa8fefbce3078f08b" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Oct 29 09:27:49 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Oct 29 09:27:49 2010 -0400" }, "message": "Merge branch \u0027bug-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work\n\nConflicts:\n\tfs/btrfs/extent-tree.c\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0cb59c9953171e9adf6da8142a5c85ceb77bb60d", "tree": "f72af47fa18815491814290a1b4907082bd9316d", "parents": [ "0af3d00bad38d3bb9912a60928ad0669f17bdb76" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Jul 02 12:14:14 2010 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Oct 29 09:26:29 2010 -0400" }, "message": "Btrfs: write out free space cache\n\nThis is a simple bit, just dump the free space cache out to our preallocated\ninode when we\u0027re writing out dirty block groups. There are a bunch of changes\nin inode.c in order to account for special cases. Mostly when we\u0027re doing the\nwriteout we\u0027re holding trans_mutex, so we need to use the nolock transacation\nfunctions. Also we can\u0027t do asynchronous completions since the async thread\ncould be blocked on already completed IO waiting for the transaction lock. This\nhas been tested with xfstests and btrfs filesystem balance, as well as my ENOSPC\ntests. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "0af3d00bad38d3bb9912a60928ad0669f17bdb76", "tree": "abbf4c773138a33dcde483ac60f016c4b5e55dcc", "parents": [ "f6f94e2ab1b33f0082ac22d71f66385a60d8157f" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jun 21 14:48:16 2010 -0400" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Oct 28 15:59:09 2010 -0400" }, "message": "Btrfs: create special free space cache inode\n\nIn order to save free space cache, we need an inode to hold the data, and we\nneed a special item to point at the right inode for the right block group. So\nfirst, create a special item that will point to the right inode, and the number\nof extent entries we will have and the number of bitmaps we will have. We\ntruncate and pre-allocate space everytime to make sure it\u0027s uptodate.\n\nThis feature will be turned on as soon as you mount with -o space_cache, however\nit is safe to boot into old kernels, they will just generate the cache the old\nfashion way. When you boot back into a newer kernel we will notice that we\nmodified and not the cache and automatically discard the cache.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "commit": "7de9c6ee3ecffd99e1628e81a5ea5468f7581a1f", "tree": "88787e77ba8a253d0a26aeda4bd5e58532d592e0", "parents": [ "646ec4615cd05972581c9c5342ed7a1e77df17bb" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Oct 23 11:11:40 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 25 21:26:11 2010 -0400" }, "message": "new helper: ihold()\n\nClones an existing reference to inode; caller must already hold one.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1d3382cbf02986e4833849f528d451367ea0b4cb", "tree": "b754f9903c0f77ce40dcff18030b49d0ce213eab", "parents": [ "a8dade34e3df581bc36ca2afe6e27055e178801c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Oct 23 15:19:20 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 25 21:24:15 2010 -0400" }, "message": "new helper: inode_unhashed()\n\nnote: for race-free uses you inode_lock held\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0019f10db6f596f3e14a19f9bd7059a1b85b0853", "tree": "9f295bc2e335a6890ea29bc0830bda43903671d9", "parents": [ "6d48755d02b150de7f47e7b4753202f2fc9f990f" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Oct 15 15:18:40 2010 -0400" }, "committer": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Oct 22 15:54:58 2010 -0400" }, "message": "Btrfs: re-work delalloc flushing\n\nCurrently we try and flush delalloc, but we only do that in a sort of weak way,\nwhich works fine in most cases but if we\u0027re under heavy pressure we need to be\nable to wait for flushing to happen. Also instead of checking the bytes\nreserved in the block_rsv, check the space info since it is more accurate. The\nsync option will be used in a future patch.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\n" }, { "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": "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": "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" } ], "next": "105a048a4f35f7a74c7cc20b36dd83658b6ec232" }