Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dadd1105 authored by Dan Carpenter's avatar Dan Carpenter Committed by Chris Mason
Browse files

Btrfs: fix some endian bugs handling the root times 



"trans->transid" is cpu endian but we want to store the data as little
endian.  "item->ctime.nsec" is only 32 bits, not 64.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
parent 55e591ff

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static noinline int create_subvol(struct btrfs_root *root, 
	uuid_le_gen(&new_uuid);

	memcpy(root_item.uuid, new_uuid.b, BTRFS_UUID_SIZE);

	root_item.otime.sec = cpu_to_le64(cur_time.tv_sec);

	root_item.otime.nsec = cpu_to_le64(cur_time.tv_nsec);

	root_item.otime.nsec = cpu_to_le32(cur_time.tv_nsec);

	root_item.ctime = root_item.otime;

	btrfs_set_root_ctransid(&root_item, trans->transid);

	btrfs_set_root_otransid(&root_item, trans->transid);

fs/btrfs/root-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -544,8 +544,8 @@ void btrfs_update_root_times(struct btrfs_trans_handle *trans, 
	struct timespec ct = CURRENT_TIME;



	spin_lock(&root->root_times_lock);

	item->ctransid = trans->transid;

	item->ctransid = cpu_to_le64(trans->transid);

	item->ctime.sec = cpu_to_le64(ct.tv_sec);

	item->ctime.nsec = cpu_to_le64(ct.tv_nsec);

	item->ctime.nsec = cpu_to_le32(ct.tv_nsec);

	spin_unlock(&root->root_times_lock);

}

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	memcpy(new_root_item->parent_uuid, root->root_item.uuid,

			BTRFS_UUID_SIZE);

	new_root_item->otime.sec = cpu_to_le64(cur_time.tv_sec);

	new_root_item->otime.nsec = cpu_to_le64(cur_time.tv_nsec);

	new_root_item->otime.nsec = cpu_to_le32(cur_time.tv_nsec);

	btrfs_set_root_otransid(new_root_item, trans->transid);

	memset(&new_root_item->stime, 0, sizeof(new_root_item->stime));

	memset(&new_root_item->rtime, 0, sizeof(new_root_item->rtime));