diff options
| author | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 22:39:46 +0100 |
| commit | 0bbc367e21bfeea33230d893be4fa3a3ff9bcb48 (patch) | |
| tree | 50fb335648a22ac519eddb772714ba64a3e6a7ec /drivers/md/dm-cache-metadata.c | |
| parent | USB: core: Codestyle fix in urb.c (diff) | |
| parent | Linux 4.3-rc7 (diff) | |
| download | kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.gz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.tar.xz kernel-qcow2-linux-0bbc367e21bfeea33230d893be4fa3a3ff9bcb48.zip | |
Merge 4.3-rc7 into usb-next
We want the USB and other fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/dm-cache-metadata.c')
| -rw-r--r-- | drivers/md/dm-cache-metadata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index 20cc36b01b77..0a17d1b91a81 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c @@ -634,10 +634,10 @@ static int __commit_transaction(struct dm_cache_metadata *cmd, disk_super = dm_block_data(sblock); + disk_super->flags = cpu_to_le32(cmd->flags); if (mutator) update_flags(disk_super, mutator); - disk_super->flags = cpu_to_le32(cmd->flags); disk_super->mapping_root = cpu_to_le64(cmd->root); disk_super->hint_root = cpu_to_le64(cmd->hint_root); disk_super->discard_root = cpu_to_le64(cmd->discard_root); |