Hello everyone,
The master branch of the btrfs unstable tree has a collection of fixes
and features:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master
If Linus decides this pull is too big/too late, we''ll maintain a bug
fix
only branch for .34 and keep this branch stable for people that want to
pull in the new features.
One big feature from this code is the ability to change which subvolume
or snapshot is mounted by default. For a while, we''ve had mount -o
subvol, which lets you jump into a subvolume instead of using the
default root. Something like this:
mkfs.btrfs /dev/xxx
mount /dev/xxx /mnt
# did I mention the new ''btrfs'' command in
btrfs-progs-unstable?
btrfs subvolume create /mnt/new_subvol
umount /mnt
mount -o subvol=new_subvol /dev/xxx /mnt
The new ioctl allows you to set this once and have it used as the new
default for every mount (without any mount options), until you change it
again. This is part of snapshot assisted upgrades, where you can take a
snapshot and revert back to the old tree if it didn''t work out.
But (and this is why I mention it up top), the ioctl also sets an
incompat bit on the super block because we ended up doing it differently
than I had planned in the disk format. People would end up with a big
surprise if they mounted with 2.6.33 and got one directory tree but
mounted with 2.6.32 and got another, so we flip an incompat bit when the
ioctl is run.
The incompat bit is only set if you run the set-default ioctl.
The btrfs-unstable git tree is against 2.6.32 so you can pull
it into older trees.
The file defragging ioctl had some bugs that could lead to getting stuck
in balance_dirty_pages. I fixed these up and changed it to only defrag
extents in the file that were actually fragmented. I added the ability
to compress a single file on demand and defrag only a range of bytes in
the file.
When snapshots are taken, we now wait for all the delayed allocation
extents to hit the disk first. When I originally made the snapshotting
code, there were many different threads flaming pony fsyncs and I had
this funny idea that people really wanted to run the btrfs sync ioctl
before snapshotting. At any rate, we have snapshotting ponies now.
There''s a new ioctl to list all the subvolumes on the filesystem. This
makes use of a new interface that runs tree searches from userland,
which we''ll build on and use for incremental backups in later
btrfs-progs releases.
Josef changed the math for df a little to better reflect space available
for data, and factors in duplication for raid and single spindle dup.
He also added a space info ioctl which shows how much space is tied up
in metadata, and shows the raid level used for metadata/data.
The short log shows that most of these changes are in the ioctls, but we
have performance fixes in the mix as well, mostly to reduce contention
on the in-ram extent mapping and state trees for each file.
Josef Bacik (10) commits (+517/-160):
Btrfs: make set/get functions for the super compat_ro flags use compat_ro
(+1/-1)
Btrfs: change the ordered tree to use a spinlock instead of a mutex
(+19/-19)
Btrfs: add ioctl and incompat flag to set the default mount subvol (+80/-1)
Btrfs: cache the extent state everywhere we possibly can V2 (+148/-90)
Btrfs: make subvolid=0 mount the original default root (+9/-3)
Btrfs: make df be a little bit more understandable (+26/-3)
Btrfs: cache extent state in find_delalloc_range (+8/-3)
Btrfs: cache ordered extent when completing io (+10/-5)
Btrfs: change how we mount subvolumes (+158/-34)
Btrfs: add a "df" ioctl for btrfs (+58/-1)
Chris Mason (6) commits (+573/-56):
Btrfs: run the backing dev more often in the submit_bio helper (+10/-10)
Btrfs: finish read pages in the order they are submitted (+4/-3)
Btrfs: don''t look at bio flags after submit_bio (+3/-3)
Btrfs: be more selective in the defrag ioctl (+140/-10)
Btrfs: add search and inode lookup ioctls (+299/-16)
Btrfs: add new defrag-range ioctl. (+117/-14)
TARUISI Hiroaki (2) commits (+99/-0):
Btrfs: add a function to lookup a directory path by following backrefs
(+92/-0)
btrfs: Update existing btrfs_device for renaming device (+7/-0)
Sage Weil (1) commits (+1/-4):
Btrfs: flush data on snapshot creation
Xiao Guangrong (1) commits (+3/-3):
btrfs: using btrfs_stack_device_id() get devid
Akinobu Mita (1) commits (+4/-30):
btrfs: use memparse
Miao Xie (1) commits (+1/-1):
btrfs: fix btrfs_mkdir goto for no free objectids
Nick Piggin (1) commits (+1/-1):
Btrfs: fix gfp flags masking in the compression code
Total: (23) commits
fs/btrfs/btrfs_inode.h | 5
fs/btrfs/compression.c | 2
fs/btrfs/ctree.h | 13
fs/btrfs/disk-io.c | 15 -
fs/btrfs/export.c | 4
fs/btrfs/extent-tree.c | 11
fs/btrfs/extent_io.c | 79 +++--
fs/btrfs/extent_io.h | 10
fs/btrfs/file.c | 23 -
fs/btrfs/inode.c | 139 +++++----
fs/btrfs/ioctl.c | 698 +++++++++++++++++++++++++++++++++++++++++++++---
fs/btrfs/ioctl.h | 113 +++++++
fs/btrfs/ordered-data.c | 41 +-
fs/btrfs/ordered-data.h | 7
fs/btrfs/relocation.c | 4
fs/btrfs/super.c | 244 ++++++++++++----
fs/btrfs/transaction.c | 5
fs/btrfs/tree-log.c | 2
fs/btrfs/volumes.c | 39 +-
19 files changed, 1199 insertions(+), 255 deletions(-)
On Mon, Mar 15, 2010 at 03:18:07PM -0400, Chris Mason wrote:> Hello everyone, > > The master branch of the btrfs unstable tree has a collection of fixes > and features: > > git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git masterI''ve updated the master tree with 3 small fixes. Thanks to Sage for sending along a one liner for a bad cast in the searching ioctl, really not sure why my gcc isn''t giving the same warnings his was. I fixed the new space info ioctl to avoid scheduling in a rcu_read_lock. Sage also turned u64 to __u64 in the space_info ioctl args struct. Here is the corrected shortlog: Josef Bacik (10) commits (+517/-160): Btrfs: make set/get functions for the super compat_ro flags use compat_ro (+1/-1) Btrfs: change the ordered tree to use a spinlock instead of a mutex (+19/-19) Btrfs: add ioctl and incompat flag to set the default mount subvol (+80/-1) Btrfs: cache the extent state everywhere we possibly can V2 (+148/-90) Btrfs: make subvolid=0 mount the original default root (+9/-3) Btrfs: make df be a little bit more understandable (+26/-3) Btrfs: cache extent state in find_delalloc_range (+8/-3) Btrfs: cache ordered extent when completing io (+10/-5) Btrfs: change how we mount subvolumes (+158/-34) Btrfs: add a "df" ioctl for btrfs (+58/-1) Chris Mason (7) commits (+619/-67): Btrfs: run the backing dev more often in the submit_bio helper (+10/-10) Btrfs: finish read pages in the order they are submitted (+4/-3) Btrfs: buffer results in the space_info ioctl (+46/-11) Btrfs: don''t look at bio flags after submit_bio (+3/-3) Btrfs: be more selective in the defrag ioctl (+140/-10) Btrfs: add search and inode lookup ioctls (+299/-16) Btrfs: add new defrag-range ioctl. (+117/-14) Sage Weil (3) commits (+7/-10): Btrfs: flush data on snapshot creation (+1/-4) Btrfs: fix search_ioctl key advance (+1/-1) Btrfs: use __u64 types in ioctl.h (+5/-5) TARUISI Hiroaki (2) commits (+99/-0): Btrfs: add a function to lookup a directory path by following backrefs (+92/-0) btrfs: Update existing btrfs_device for renaming device (+7/-0) Xiao Guangrong (1) commits (+3/-3): btrfs: using btrfs_stack_device_id() get devid Akinobu Mita (1) commits (+4/-30): btrfs: use memparse Miao Xie (1) commits (+1/-1): btrfs: fix btrfs_mkdir goto for no free objectids Nick Piggin (1) commits (+1/-1): Btrfs: fix gfp flags masking in the compression code Total: (26) commits fs/btrfs/ioctl.c | 757 ++++++++++++++++++++++++++++++++++++++++++++---- fs/btrfs/super.c | 244 +++++++++++---- fs/btrfs/inode.c | 139 +++++--- fs/btrfs/ioctl.h | 123 +++++++ fs/btrfs/extent_io.c | 79 +++-- fs/btrfs/ordered-data.c | 41 +- fs/btrfs/volumes.c | 39 +- fs/btrfs/file.c | 23 - fs/btrfs/disk-io.c | 15 fs/btrfs/ctree.h | 13 fs/btrfs/extent-tree.c | 11 fs/btrfs/extent_io.h | 10 fs/btrfs/ordered-data.h | 7 fs/btrfs/transaction.c | 5 fs/btrfs/btrfs_inode.h | 5 fs/btrfs/relocation.c | 4 fs/btrfs/export.c | 4 fs/btrfs/tree-log.c | 2 fs/btrfs/compression.c | 2 19 files changed, 1251 insertions(+), 272 deletions(-)
On Tue, Mar 16, 2010 at 05:01:50PM -0400, Chris Mason wrote:> On Mon, Mar 15, 2010 at 03:18:07PM -0400, Chris Mason wrote: > > Hello everyone, > > > > The master branch of the btrfs unstable tree has a collection of fixes > > and features: > >git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master> > I''ve updated the master tree with 3 small fixes. Thanks to Sage for > sending along a one liner for a bad cast in the searching ioctl, really > not sure why my gcc isn''t giving the same warnings his was. > > I fixed the new space info ioctl to avoid scheduling in a > rcu_read_lock. Sage also turned u64 to __u64 in the space_info ioctl > args struct.I mentioned how the new searching ioctl could be used to very quickly find updated files, and that I was planning on adding this. There were a few questions about how it might work, so I worked up a prototype. I had to make some small mods to the kernel side to be more friendly to userland, mostly just fixing up how we advance through the keys. For an example of how this works, cloned the linux-26 git repo onto a fresh FS, then modified a single file. I timed how long it took find to find my one modified file (via find -newer) and I timed my ioctl. Find took 9s, the ioctl took .024s. A repeat of the test on a much larger filesystem had find timed in at 25s and the ioctl at 2s. The prototype is called btrfs subvol find-new and it can be found in the master branch of the btrfs-progs-unstable repo. I''ve updated the master branch on the kernel side. Here are the updates since my last pull request: Chris Mason (4) commits (+35/-18): Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree (+6/-3) Btrfs: fix key checks and advance in the search ioctl (+25/-14) Btrfs: return keys for large items to the search ioctl (+1/-1) Btrfs: allow treeid==0 in the inode lookup ioctl (+3/-0) Total: (4) commits fs/btrfs/ioctl.c | 53 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 18 deletions(-) And here is the full log of things missing from Linus'' git tree right now. Chris Mason (11) commits (+654/-85): Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree (+6/-3) Btrfs: run the backing dev more often in the submit_bio helper (+10/-10) Btrfs: finish read pages in the order they are submitted (+4/-3) Btrfs: fix key checks and advance in the search ioctl (+25/-14) Btrfs: return keys for large items to the search ioctl (+1/-1) Btrfs: allow treeid==0 in the inode lookup ioctl (+3/-0) Btrfs: buffer results in the space_info ioctl (+46/-11) Btrfs: don''t look at bio flags after submit_bio (+3/-3) Btrfs: be more selective in the defrag ioctl (+140/-10) Btrfs: add search and inode lookup ioctls (+299/-16) Btrfs: add new defrag-range ioctl. (+117/-14) Josef Bacik (10) commits (+517/-160): Btrfs: make set/get functions for the super compat_ro flags use compat_ro (+1/-1) Btrfs: change the ordered tree to use a spinlock instead of a mutex (+19/-19) Btrfs: add ioctl and incompat flag to set the default mount subvol (+80/-1) Btrfs: cache the extent state everywhere we possibly can V2 (+148/-90) Btrfs: make subvolid=0 mount the original default root (+9/-3) Btrfs: make df be a little bit more understandable (+26/-3) Btrfs: cache extent state in find_delalloc_range (+8/-3) Btrfs: cache ordered extent when completing io (+10/-5) Btrfs: change how we mount subvolumes (+158/-34) Btrfs: add a "df" ioctl for btrfs (+58/-1) Sage Weil (3) commits (+7/-10): Btrfs: flush data on snapshot creation (+1/-4) Btrfs: fix search_ioctl key advance (+1/-1) Btrfs: use __u64 types in ioctl.h (+5/-5) TARUISI Hiroaki (2) commits (+99/-0): Btrfs: add a function to lookup a directory path by following backrefs (+92/-0) btrfs: Update existing btrfs_device for renaming device (+7/-0) Xiao Guangrong (1) commits (+3/-3): btrfs: using btrfs_stack_device_id() get devid Akinobu Mita (1) commits (+4/-30): btrfs: use memparse Miao Xie (1) commits (+1/-1): btrfs: fix btrfs_mkdir goto for no free objectids Nick Piggin (1) commits (+1/-1): Btrfs: fix gfp flags masking in the compression code Total: (30) commits fs/btrfs/ioctl.c | 810 +++++++++++++++++++++++++++++++++++++++++++----- fs/btrfs/super.c | 244 ++++++++++---- fs/btrfs/inode.c | 139 +++++--- fs/btrfs/ioctl.h | 123 ++++++- fs/btrfs/extent_io.c | 79 ++-- fs/btrfs/ordered-data.c | 41 +- fs/btrfs/volumes.c | 39 +- fs/btrfs/file.c | 23 - fs/btrfs/disk-io.c | 15 fs/btrfs/ctree.h | 13 fs/btrfs/extent-tree.c | 11 fs/btrfs/extent_io.h | 10 fs/btrfs/ordered-data.h | 7 fs/btrfs/transaction.c | 5 fs/btrfs/btrfs_inode.h | 5 fs/btrfs/relocation.c | 4 fs/btrfs/export.c | 4 fs/btrfs/tree-log.c | 2 fs/btrfs/compression.c | 2 19 files changed, 1286 insertions(+), 290 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello everyone,
The master branch of the btrfs-unstable repo has a collection of fixes:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master
Josef fixed a few different ENOSPC problems, and removed the mount -o
max_extent mount option, which was not used and didn''t fit in well with
enospc at all.
Sage fixed up when and how we add the directory entries that go with
snapshots, which will avoid dangling directory entries if we crash at
the wrong time during snapshot creation.
Nick Piggin made the btrfs page cache code a little bit less of a special
snowflake, switching us back to the proper API.
Zhao Lei and Miao Xie contributed a long series of cleanups and fixes.
I''ve put the cleanups into a .35 queue and the fixes are here.
Josef Bacik (4) commits (+32/-91):
Btrfs: fail to mount if we have problems reading the block groups (+12/-4)
Btrfs: fix small race with delalloc flushing waitqueue''s (+4/-5)
Btrfs: fix chunk allocate size calculation (+3/-1)
Btrfs: kill max_extent mount option (+13/-81)
Zhao Lei (3) commits (+9/-12):
Btrfs: Simplify num_stripes''s calculation logical for
__btrfs_alloc_chunk() (+2/-2)
Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()
(+2/-0)
Btrfs: Remove unnecessary finish_wait() in wait_current_trans() (+5/-10)
Dan Carpenter (3) commits (+5/-1):
Btrfs: handle kmalloc() failure in inode lookup ioctl (+3/-0)
Btrfs: check btrfs_get_extent return for IS_ERR() (+1/-1)
Btrfs: dereferencing freed memory (+1/-0)
Sage Weil (1) commits (+31/-66):
Btrfs: create snapshot references in same commit as snapshot
Andrea Gelmini (1) commits (+0/-1):
Btrfs: remove duplicate include in ioctl.c
Chris Mason (1) commits (+4/-0):
Btrfs: add check for changed leaves in setup_leaf_for_split
Miao Xie (1) commits (+4/-1):
Btrfs: add NULL check for do_walk_down()
Nick Piggin (1) commits (+5/-32):
Btrfs: use add_to_page_cache_lru, use __page_cache_alloc
Total: (15) commits
fs/btrfs/transaction.c | 112 +++++++++++++++---------------------------------
fs/btrfs/inode.c | 59 +------------------------
fs/btrfs/super.c | 23 +--------
fs/btrfs/extent-tree.c | 23 ++++++---
fs/btrfs/compression.c | 22 +--------
fs/btrfs/extent_io.c | 15 ------
fs/btrfs/disk-io.c | 12 +++--
fs/btrfs/volumes.c | 10 +++-
fs/btrfs/ioctl.c | 7 ++-
fs/btrfs/ordered-data.c | 6 +-
fs/btrfs/ctree.c | 4 +
fs/btrfs/ctree.h | 1
12 files changed, 90 insertions(+), 204 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 05, 2010 at 03:36:37PM -0400, Chris Mason wrote:> Hello everyone, > > The master branch of the btrfs-unstable repo has a collection of fixes: > > git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git master >That pull request was missing another enospc fix from Josef, and Yan Zheng noticed we were sometimes trying to allocate zero sized chunks from the disk pool. I''ve updated the git tree with two new commits, here is the corrected shortlog: Josef Bacik (5) commits (+47/-96): Btrfs: fail to mount if we have problems reading the block groups (+12/-4) Btrfs: fix small race with delalloc flushing waitqueue''s (+4/-5) Btrfs: fix chunk allocate size calculation (+3/-1) Btrfs: fix data enospc check overflow (+15/-5) Btrfs: kill max_extent mount option (+13/-81) Zhao Lei (3) commits (+9/-12): Btrfs: Simplify num_stripes''s calculation logical for __btrfs_alloc_chunk() (+2/-2) Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree() (+2/-0) Btrfs: Remove unnecessary finish_wait() in wait_current_trans() (+5/-10) Dan Carpenter (3) commits (+5/-1): Btrfs: handle kmalloc() failure in inode lookup ioctl (+3/-0) Btrfs: check btrfs_get_extent return for IS_ERR() (+1/-1) Btrfs: dereferencing freed memory (+1/-0) Chris Mason (2) commits (+10/-0): Btrfs: make sure the chunk allocator doesn''t create zero length chunks (+6/-0) Btrfs: add check for changed leaves in setup_leaf_for_split (+4/-0) Sage Weil (1) commits (+31/-66): Btrfs: create snapshot references in same commit as snapshot Andrea Gelmini (1) commits (+0/-1): Btrfs: remove duplicate include in ioctl.c Miao Xie (1) commits (+4/-1): Btrfs: add NULL check for do_walk_down() Nick Piggin (1) commits (+5/-32): Btrfs: use add_to_page_cache_lru, use __page_cache_alloc Total: (17) commits fs/btrfs/transaction.c | 112 +++++++++++++++--------------------------------- fs/btrfs/inode.c | 59 +------------------------ fs/btrfs/extent-tree.c | 43 ++++++++++++------ fs/btrfs/super.c | 23 +-------- fs/btrfs/compression.c | 22 +-------- fs/btrfs/volumes.c | 16 +++++- fs/btrfs/extent_io.c | 15 ------ fs/btrfs/disk-io.c | 12 +++-- fs/btrfs/ioctl.c | 7 ++- fs/btrfs/ordered-data.c | 6 +- fs/btrfs/ctree.c | 4 + fs/btrfs/ctree.h | 1 12 files changed, 111 insertions(+), 209 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html