This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "XFS development tree". The branch, master has been updated ef49624 xfs: cleanup xfs_bmap.h b32ccb3 xfs: dont ignore error code from xfs_bmbt_update e1e3608 xfs: pass bmalloca to xfs_bmap_add_extent_hole_real c763ccc xfs: pass bmalloca to xfs_bmap_add_extent_delay_real d8e079d xfs: move logflags into bmalloca 459a52d xfs: move lastx and nallocs into bmalloca 2ac3d59 xfs: move btree cursor into bmalloca 5e54c9d xfs: do not keep local copies of allocation ranges in xfs_bmapi_allocate 9eb095d xfs: rename allocation range fields in struct xfs_bmalloca 1631b20 xfs: move firstblock and bmap freelist cursor into bmalloca structure 79c8936 xfs: move extent records into bmalloca structure 73a8fde xfs: pass bmalloca structure to xfs_bmap_isaeof 7d3d6c3 xfs: remove xfs_bmap_add_extent cb300d6 xfs: introduce xfs_bmap_last_extent 5bfa7e3 xfs: rename xfs_bmapi to xfs_bmapi_write 0d1c5f2 xfs: factor unwritten extent map manipulations out of xfs_bmapi c59a0b0 xfs: factor extent allocation out of xfs_bmapi 32855a9 xfs: do not use xfs_bmap_add_extent for adding delalloc extents 00a1896 xfs: introduce xfs_bmapi_delay() 5003bdf xfs: factor delalloc reservations out of xfs_bmapi 5bc3484 xfs: remove xfs_bmapi_single() bd8c50c xfs: introduce xfs_bmapi_read() 2f7effb xfs: factor extent map manipulations out of xfs_bmapi 86051fa xfs: remove the nextents variable in xfs_bmapi 1989208 xfs: remove impossible to read code in xfs_bmap_add_extent_delay_real 1342c23 xfs: remove the first extent special case in xfs_bmap_add_extent from 3c9feb308b1802a8538860bba8926f3dfe255612 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ef49624be283c67c40dcdac94ca125e1ddda8ff6 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:41:07 2011 +0000 xfs: cleanup xfs_bmap.h Convert all function prototypes to the short form used elsewhere, and remove duplicates of comments already placed at the function body. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit b32ccb3fa61f36ea07b370baf76f7020488d2364 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:41:06 2011 +0000 xfs: dont ignore error code from xfs_bmbt_update Fix a case in xfs_bmap_add_extent_unwritten_real where we aren't passing the returned error on. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit e1e360817f91dc68a73c755a15ed9d84a21be46c Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:41:05 2011 +0000 xfs: pass bmalloca to xfs_bmap_add_extent_hole_real All the parameters passed to xfs_bmap_add_extent_hole_real() are in the xfs_bmalloca structure now. Just pass the bmalloca parameter to the function instead of 8 separate parameters. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit c763ccc7d1ad6e8751d6d6d0fdd814ca2169dd67 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:41:04 2011 +0000 xfs: pass bmalloca to xfs_bmap_add_extent_delay_real All the parameters passed to xfs_bmap_add_extent_delay_real() are in the xfs_bmalloca structure now. Just pass the bmalloca parameter to the function instead of 8 separate parameters. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit d8e079d401e675d73316b138f840e16ae37fa825 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:41:02 2011 +0000 xfs: move logflags into bmalloca Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 459a52d68d721717b084c1a1957721072423cff9 Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:41:01 2011 +0000 xfs: move lastx and nallocs into bmalloca Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 2ac3d5909c0f4900cded43bfee65847783a976de Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:41:00 2011 +0000 xfs: move btree cursor into bmalloca Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 5e54c9d694b56de4f827f69ef57f444e6c832c42 Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:59 2011 +0000 xfs: do not keep local copies of allocation ranges in xfs_bmapi_allocate Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 9eb095d2b1089a4105135241037191fdc6c1050e Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:58 2011 +0000 xfs: rename allocation range fields in struct xfs_bmalloca Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 1631b20d18b7fccb8113b9a8e6a7d4a57207a6fa Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:57 2011 +0000 xfs: move firstblock and bmap freelist cursor into bmalloca structure Rather than passing the firstblock and freelist structure around, embed it into the bmalloca structure and remove it from the function parameters. This also enables the minleft parameter to be set only once in xfs_bmapi_write(), and the freelist cursor directly queried in xfs_bmapi_allocate to clear it when the lowspace algorithm is activated. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 79c893656d59c13e2542ddfe7de1a22c8f15309c Author: Dave Chinner <david@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:56 2011 +0000 xfs: move extent records into bmalloca structure Rather that putting extent records on the stack and then pointing to them in the bmalloca structure which is in the same stack frame, put the extent records directly in the bmalloca structure. This reduces the number of args that need to be passed around. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 73a8fde4f33a630c6d401acf88b7172e5525627c Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:55 2011 +0000 xfs: pass bmalloca structure to xfs_bmap_isaeof All the variables xfs_bmap_isaeof() is passed are contained within the xfs_bmalloca structure. Pass that instead. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 7d3d6c30e25708d9ba78e8e1f36316ebeafce793 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:54 2011 +0000 xfs: remove xfs_bmap_add_extent There is no real need to the xfs_bmap_add_extent, as the callers know what kind of extents they need to it. Removing it means duplicating the extents to btree conversion logic in three places, but overall it's still much simpler code and quite a bit less code. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit cb300d65eb4d4e2e96fbc9c08cc9d858464232a9 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:53 2011 +0000 xfs: introduce xfs_bmap_last_extent Add a common helper for finding the last extent in a file. Largely based on a patch from Dave Chinner. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 5bfa7e311949b022d91f459200d56bb7a3dc7f3a Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:52 2011 +0000 xfs: rename xfs_bmapi to xfs_bmapi_write Now that all the read-only users of xfs_bmapi have been converted to use xfs_bmapi_read(), we can remove all the read-only handling cases from xfs_bmapi(). Once this is done, rename xfs_bmapi to xfs_bmapi_write to reflect the fact it is for allocation only. This enables us to kill the XFS_BMAPI_WRITE flag as well. Also clean up xfs_bmapi_write to the style used in the newly added xfs_bmapi_read/delay functions. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 0d1c5f2655cacc4d044871c940237168ca618e61 Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:51 2011 +0000 xfs: factor unwritten extent map manipulations out of xfs_bmapi To further improve the readability of xfs_bmapi(), factor the unwritten extent conversion out into a separate function. This removes large block of logic from the xfs_bmapi() code loop and makes it easier to see the operational logic flow for xfs_bmapi(). Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit c59a0b0bdac51b7f96f805f8c1eb8660a1a52b1d Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:50 2011 +0000 xfs: factor extent allocation out of xfs_bmapi To further improve the readability of xfs_bmapi(), factor the extent allocation out into a separate function. This removes a large block of logic from the xfs_bmapi() code loop and makes it easier to see the operational logic flow for xfs_bmapi(). Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 32855a9804b4a967e2230b82fcf6caba82c5525b Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:49 2011 +0000 xfs: do not use xfs_bmap_add_extent for adding delalloc extents We can just call xfs_bmap_add_extent_hole_delay directly to add a delayed allocated regions to the extent tree, instead of going through all the complexities of xfs_bmap_add_extent that aren't needed for this simple case. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 00a1896173a9acff320c70cb4e40592d0344e428 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:48 2011 +0000 xfs: introduce xfs_bmapi_delay() Delalloc reservations are much simpler than allocations, so give them a separate bmapi-level interface. Using the previously added xfs_bmapi_reserve_delalloc we get a function that is only minimally more complicated than xfs_bmapi_read, which is far from the complexity in xfs_bmapi. Also remove the XFS_BMAPI_DELAY code after switching over the only user to xfs_bmapi_delay. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 5003bdf58e0649cfca322eb554b6ab9dba201b30 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:47 2011 +0000 xfs: factor delalloc reservations out of xfs_bmapi Move the reservation of delayed allocations, and addition of delalloc regions to the extent trees into a new helper function. For now this adds some twisted goto logic to xfs_bmapi, but that will be cleaned up in the following patches. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 5bc34846735f610ce06de0789c9287756c857160 Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:46 2011 +0000 xfs: remove xfs_bmapi_single() Now we have xfs_bmapi_read, there is no need for xfs_bmapi_single(). Change the remaining caller over and kill the function. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit bd8c50cefff88bfd0700fad2be05045db4c61c1c Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:45 2011 +0000 xfs: introduce xfs_bmapi_read() xfs_bmapi() currently handles both extent map reading and allocation. As a result, the code is littered with "if (wr)" branches to conditionally do allocation operations if required. This makes the code much harder to follow and causes significant indent issues with the code. Given that read mapping is much simpler than allocation, we can split out read mapping from xfs_bmapi() and reuse the logic that we have already factored out do do all the hard work of handling the extent map manipulations. The results in a much simpler function for the common extent read operations, and will allow the allocation code to be simplified in another commit. Once xfs_bmapi_read() is implemented, convert all the callers of xfs_bmapi() that are only reading extents to use the new function. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 2f7effbf70fe04560a1dc5f4fefc1bfa01595d74 Author: Dave Chinner <dchinner@xxxxxxxxxx> Date: Sun Sep 18 20:40:44 2011 +0000 xfs: factor extent map manipulations out of xfs_bmapi To further improve the readability of xfs_bmapi(), factor the pure extent map manipulations out into separate functions. This removes large blocks of logic from the xfs_bmapi() code loop and makes it easier to see the operational logic flow for xfs_bmapi(). Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 86051fad1607f9c4c50c9f55853186df0c9ef992 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:43 2011 +0000 xfs: remove the nextents variable in xfs_bmapi Instead of using a local variable that needs to updated when we modify the extent map just check ifp->if_bytes directly where we use it. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 1989208fa60ec04f80cceb8fc528c6a541803210 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:42 2011 +0000 xfs: remove impossible to read code in xfs_bmap_add_extent_delay_real We already have the worst case blocks reserved, so xfs_icsb_modify_counters won't fail in xfs_bmap_add_extent_delay_real. In fact we've had an assert to catch this case since day and it never triggered. So remove the code to try smaller reservations, and just return the error for that case in addition to keeping the assert. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> commit 1342c23e864e3de71c97dcd73fa9691606febee2 Author: Christoph Hellwig <hch@xxxxxxxxxxxxx> Date: Sun Sep 18 20:40:41 2011 +0000 xfs: remove the first extent special case in xfs_bmap_add_extent Both xfs_bmap_add_extent_hole_delay and xfs_bmap_add_extent_hole_real already contain code to handle the case where there is no extent to merge with, which is effectively the same as the code duplicated here. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Alex Elder <aelder@xxxxxxx> ----------------------------------------------------------------------- Summary of changes: fs/xfs/xfs_aops.c | 8 +- fs/xfs/xfs_attr.c | 35 +- fs/xfs/xfs_attr_leaf.c | 5 +- fs/xfs/xfs_bmap.c | 2517 +++++++++++++++++++++++------------------------ fs/xfs/xfs_bmap.h | 318 ++----- fs/xfs/xfs_da_btree.c | 43 +- fs/xfs/xfs_dir2_leaf.c | 6 +- fs/xfs/xfs_dquot.c | 17 +- fs/xfs/xfs_file.c | 10 +- fs/xfs/xfs_filestream.c | 4 +- fs/xfs/xfs_inode.c | 12 +- fs/xfs/xfs_iomap.c | 33 +- fs/xfs/xfs_qm.c | 7 +- fs/xfs/xfs_rtalloc.c | 38 +- fs/xfs/xfs_vnodeops.c | 43 +- 15 files changed, 1421 insertions(+), 1675 deletions(-) hooks/post-receive -- XFS development tree _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs