diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
commit | 840ed42942cc1ebbda2ed55f4019673b537fc5de (patch) | |
tree | 415644488e3966837eeb5061d96d4ca7db862318 /fs/btrfs/volumes.c | |
parent | 0dca30003bc752b2fc15906e562ef4e4925725fd (diff) | |
parent | 0a9d5ac307aefbb2c772537d3fe7f75046d563ac (diff) | |
download | talos-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.gz talos-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.zip |
Merge branch 'next/hdmi-samsung' into next/devel-samsung
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r-- | fs/btrfs/volumes.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 029b903a4ae3..0f5ebb72a5ea 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1819,6 +1819,13 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path) "Failed to relocate sys chunks after " "device initialization. This can be fixed " "using the \"btrfs balance\" command."); + trans = btrfs_attach_transaction(root); + if (IS_ERR(trans)) { + if (PTR_ERR(trans) == -ENOENT) + return 0; + return PTR_ERR(trans); + } + ret = btrfs_commit_transaction(trans, root); } return ret; |