search for: btrfs_sync_fs

Currently the fs sync function (super.c:btrfs_sync_fs()) doesn''t wait for delayed work to finish before returning success to the caller. This change fixes this, ensuring that there''s no data loss if a power failure happens right after fs sync returns success to the caller and before the next commit happens. Steps to reproduce the da...

...utex_unlock(&inode->i_mutex); + btrfs_free_path(path); + return ret; +} + static long btrfs_ioctl_clone_range(struct file *file, void __user *argp) { struct btrfs_ioctl_clone_range_args args; @@ -2034,6 +2135,8 @@ long btrfs_ioctl(struct file *file, unsigned int case BTRFS_IOC_SYNC: btrfs_sync_fs(file->f_dentry->d_sb, 1); return 0; + case BTRFS_IOC_COMPR_SIZE: + return btrfs_ioctl_compsize(file, argp); } return -ENOTTY; diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index 424694a..a01ef1e 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -178,4 +178,5 @@ struct btrfs...

...\n"); btrfs_set_opt(info->mount_opt, NOTREELOG); break; + case Opt_flushoncommit: + printk(KERN_INFO "btrfs: turning on flush-on-commit\n"); + btrfs_set_opt(info->mount_opt, FLUSHONCOMMIT); + break; default: break; } @@ -369,9 +374,8 @@ fail_close: int btrfs_sync_fs(struct super_block *sb, int wait) { struct btrfs_trans_handle *trans; - struct btrfs_root *root; + struct btrfs_root *root = btrfs_sb(sb); int ret; - root = btrfs_sb(sb); if (sb->s_flags & MS_RDONLY) return 0; diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 919...

...btrfs/super.c +++ b/fs/btrfs/super.c @@ -462,7 +462,6 @@ static struct super_operations btrfs_super_ops = { .delete_inode = btrfs_delete_inode, .put_inode = btrfs_put_inode, .put_super = btrfs_put_super, - .read_inode = btrfs_read_locked_inode, .write_super = btrfs_write_super, .sync_fs = btrfs_sync_fs, .write_inode = btrfs_write_inode,

...tion(trans, root); + + mnt_drop_write(file->f_path.mnt); + out_unlock: + mutex_unlock(&inode->i_mutex); + return 0; +} + long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -1278,6 +1326,8 @@ long btrfs_ioctl(struct file *file, unsi case BTRFS_IOC_SYNC: btrfs_sync_fs(file->f_dentry->d_sb, 1); return 0; + case BTRFS_IOC_COMPRESS: + return btrfs_ioctl_inode_flag(file, BTRFS_INODE_NOCOMPRESS, 0); } return -ENOTTY; Index: newformat2/fs/btrfs/ioctl.h =================================================================== --- newformat2.orig/fs/btrfs/ioctl...

...8dd78 ffff88011263fef8 Call Trace: [<ffffffff811b469e>] write_ctree_super+0xe/0x10 [<ffffffff811b9778>] btrfs_commit_transaction+0x6a8/0x870 [<ffffffff811b8a8a>] ? join_transaction+0x24a/0x280 [<ffffffff810611f0>] ? wake_up_bit+0x40/0x40 [<ffffffff81195a57>] btrfs_sync_fs+0x47/0x70 [<ffffffff811029be>] __sync_filesystem+0x5e/0x90 [<ffffffff81102a53>] sync_filesystem+0x43/0x60 [<ffffffff810dc226>] generic_shutdown_super+0x36/0xe0 [<ffffffff810dc361>] kill_anon_super+0x11/0x20 [<ffffffff810dc715>] deactivate_locked_super+0x45/0x...

...+ btrfs_abort_transaction(root, PTR_ERR(trans)); return ERR_CAST(trans); + } err = btrfs_find_free_objectid(root, &objectid); if (err) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 3559d0b..1ce61f7 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -662,8 +662,10 @@ int btrfs_sync_fs(struct super_block *sb, int wait) btrfs_wait_ordered_extents(root, 0, 0); trans = btrfs_start_transaction(root, 0); - if (IS_ERR(trans)) + if (IS_ERR(trans)) { + btrfs_abort_transaction(root, PTR_ERR(trans)); return PTR_ERR(trans); + } ret = btrfs_commit_transaction(trans, root); retu...

...ion+0x3ff/0x709 [btrfs] [515954.295050] [<ffffffff8136f6e6>] ? _raw_spin_lock+0xe/0x10 [515954.295050] [<ffffffffa02f7b07>] ? join_transaction.clone.23+0x1ca/0x200 [btrfs] [515954.295050] [<ffffffff81068ffb>] ? wake_up_bit+0x2a/0x2a [515954.295050] [<ffffffffa02dc45b>] ? btrfs_sync_fs+0x9f/0xa7 [btrfs] [515954.295050] [<ffffffff81135ba8>] ? __sync_filesystem+0x66/0x7a [515954.295050] [<ffffffff81135c20>] ? sync_filesystem+0x4c/0x50 [515954.295050] [<ffffffff811151d8>] ? generic_shutdown_super+0x38/0xf6 [515954.295050] [<ffffffff81115316>] ? kill_anon_...

...fs] [ 121.451766] [<000003e0007093e4>] btrfs_cow_block+0x220/0x234 [btrfs] [ 121.451857] [<000003e00072761a>] btrfs_commit_tree_roots+0x6e/0x21c [btrfs] [ 121.452077] [<000003e000728c56>] btrfs_commit_transaction+0x33a/0x7ac [btrfs] [ 121.452175] [<000003e000704bec>] btrfs_sync_fs+0x88/0xa0 [btrfs] [ 121.452264] [<0000000000121d88>] quota_sync_sb+0x50/0x118 [ 121.452287] [<00000000000d23e8>] __fsync_super+0x30/0xfc [ 121.452309] [<00000000000d24d2>] fsync_super+0x1e/0x30 [ 121.452330] [<00000000000d28c6>] generic_shutdown_super+0x3e/0x1a4 [ 1...

This reverts commit 5500cdbe14d7435e04f66ff3cfb8ecd8b8e44ebf. We had numerous reports of premature ENOSPC that were bisected to this patch. Reverting will not break things but a warning in ''use_block_rsv'' may show up in the syslog. There''s no alternative fix in sight and the ENOSPC problem affects all 3.3 btrfs users during normal filesystem use. CC:

...bbc>] write_ctree_super+0xe/0x10 [btrfs] Jun 9 00:41:33 dl580 kernel: [<ffffffffa02de39f>] btrfs_commit_transaction+0x6bb/0x841 [bt rfs] Jun 9 00:41:33 dl580 kernel: [<ffffffff80246914>] ? autoremove_wake_function+0x0/0x38 Jun 9 00:41:33 dl580 kernel: [<ffffffffa02c14ed>] btrfs_sync_fs+0x67/0x72 [btrfs] Jun 9 00:41:33 dl580 kernel: [<ffffffff802e6e3a>] quota_sync_sb+0x42/0xf3 Jun 9 00:41:33 dl580 kernel: [<ffffffff802e6f14>] sync_dquots+0x29/0x138 Jun 9 00:41:33 dl580 kernel: [<ffffffff802a8c29>] __fsync_super+0x1e/0x7b Jun 9 00:41:33 dl580 kernel: [<...

...[btrfs] Jun 10 14:57:17 mithrandir kernel: [ 266.182487] [<ffffffff810481cc>] ? add_wait_queue+0x44/0x44 Jun 10 14:57:17 mithrandir kernel: [ 266.182534] [<ffffffff810d13d6>] ? __sync_filesystem+0x72/0x72 Jun 10 14:57:17 mithrandir kernel: [ 266.182589] [<ffffffffa0216bd5>] btrfs_sync_fs+0x62/0x66 [btrfs] Jun 10 14:57:17 mithrandir kernel: [ 266.182639] [<ffffffff810d13c2>] __sync_filesystem+0x5e/0x72 Jun 10 14:57:17 mithrandir kernel: [ 266.182686] [<ffffffff810d13e7>] sync_one_sb+0x11/0x13 Jun 10 14:57:17 mithrandir kernel: [ 266.182730] [<ffffffff810b49ec&gt...

...serve_metadata_space(root, 5*ut.num_ops); +out_drop_write: + mnt_drop_write(file->f_path.mnt); +out: + return ret; +} + long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -1343,6 +1528,8 @@ long btrfs_ioctl(struct file *file, unsigned int case BTRFS_IOC_SYNC: btrfs_sync_fs(file->f_dentry->d_sb, 1); return 0; + case BTRFS_IOC_USERTRANS: + return btrfs_ioctl_usertrans(file, argp); } return -ENOTTY; diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index bc49914..f94e293 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -67,4 +67,53 @@ struct btrfs_...

Hi everyone, This patchset is the latest approach I''m using for the Ceph storage daemon to keep track of which data has safely committed to disk. The basic idea is to not use the (problematic) user transaction ioctls at all. Instead, the daemon quiesces its own write requests, initiates an async snapshot, and then continues. The snapshot approach is nice because it provides rollback.

Hello, I''m seeing a lot of warnings in dmesg with a BTRFS filesystem. I''m using the 3.1 kernel, I found a patch for these warnings ( http://marc.info/?l=linux-btrfs&m=131547325515336&w=2) <http://marc.info/?l=linux-btrfs&m=131547325515336&w=2>, but that patch has already been included in 3.1. Are there any other patches I can try? I''m using

...ons that @@ -2031,6 +2093,8 @@ long btrfs_ioctl(struct file *file, unsigned int return btrfs_ioctl_ino_lookup(file, argp); case BTRFS_IOC_SPACE_INFO: return btrfs_ioctl_space_info(root, argp); + case BTRFS_IOC_DISK_INFO: + return btrfs_ioctl_disk_info(root, argp); case BTRFS_IOC_SYNC: btrfs_sync_fs(file->f_dentry->d_sb, 1); return 0; diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index 424694a..294e8c3 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -138,6 +138,11 @@ struct btrfs_ioctl_space_args { struct btrfs_ioctl_space_info spaces[0]; }; +struct btrfs_ioctl_disk_in...

Hello On my HP Compaq dc5800 with Ubuntu 13.04 and their 3.8.0-19-lowlatency kernel, I''ve got quite some kernel traces in the syslog. You can find them below or at http://pastebin.com/bLXPBX67 (to avoid line breaks…). These kernel traces all begin with: WARNING: at fs/btrfs/free-space-cache.c:921 __btrfs_write_out_cache+0x6b9/0x9a0 [btrfs]() Most of the time, it starts with: Call

...6 - one for every root */ + err = btrfs_force_transaction_commit(rc->extent_root, 0); out: if (rc) { btrfs_stop_workers(&rc->workers); diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 708ac06..cf21c1b 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -407,6 +407,9 @@ int btrfs_sync_fs(struct super_block *sb, int wait) btrfs_wait_ordered_extents(root, 0); trans = btrfs_start_transaction(root, 1); + if (IS_ERR(trans)) + return PTR_ERR(trans); + ret = btrfs_commit_transaction(trans, root); sb->s_dirt = 0; return ret; diff --git a/fs/btrfs/transaction.c b/fs/btrfs/tr...

Hi Chris, This is the extent of my current queue of Btrfs snapshot/subvol/commit stuff. Most of these were posted several months ago. Can be sent upstream during this merge window? Not having this functionality is becoming a bit of a roadblock for our efforts to keep the Ceph data in a consistent state. These patches are also available from