diff --git a/src/add-ons/kernel/file_systems/btrfs/AttributeIterator.h b/src/add-ons/kernel/file_systems/btrfs/AttributeIterator.h
index 58126ba6f9..243e7bdc53 100644
--- a/src/add-ons/kernel/file_systems/btrfs/AttributeIterator.h
+++ b/src/add-ons/kernel/file_systems/btrfs/AttributeIterator.h
@@ -16,7 +16,7 @@ public:
 			//! Constructs an AttributeIterator object for Inode object *inode
 								AttributeIterator(Inode* inode);
 								~AttributeIterator();
-			//! Check if fIterator pointer is valid 
+			//! Check if fIterator pointer is valid
 			status_t			InitCheck();
 
 			/*! Copy details of next Attribute into *name and *_nameLength
diff --git a/src/add-ons/kernel/file_systems/btrfs/BTree.cpp b/src/add-ons/kernel/file_systems/btrfs/BTree.cpp
index 2aab8727f4..d21c830eb5 100644
--- a/src/add-ons/kernel/file_systems/btrfs/BTree.cpp
+++ b/src/add-ons/kernel/file_systems/btrfs/BTree.cpp
@@ -248,7 +248,7 @@ status_t
 BTree::Node::MoveEntries(uint32 start, uint32 end, int length) const
 {
 	status_t status = _SpaceCheck(length);
-	if (status != B_OK || length == 0/*B_OK*/)
+	if (status != B_OK || length == 0 /*B_OK*/)
 		return status;
 
 	int entrySize = sizeof(btrfs_entry);
diff --git a/src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.cpp b/src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.cpp
index 34db176a42..24a7e684e7 100644
--- a/src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.cpp
+++ b/src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.cpp
@@ -255,7 +255,7 @@ CachedExtentTree::_AddFreeExtent(CachedExtent* node)
 		found->offset += diff + node->length;
 		found->length -= diff + node->length;
 		// diff < 0 couldn't happen because of the Compare function
-		if (diff > 0){
+		if (diff > 0) {
 			CachedExtent* left = CachedExtent::Create(node->offset - diff,
 				diff, found->flags);
 			_AddAllocatedExtent(left);
diff --git a/src/add-ons/kernel/file_systems/btrfs/Inode.h b/src/add-ons/kernel/file_systems/btrfs/Inode.h
index cdfebbadd0..5c9165d207 100644
--- a/src/add-ons/kernel/file_systems/btrfs/Inode.h
+++ b/src/add-ons/kernel/file_systems/btrfs/Inode.h
@@ -99,6 +99,7 @@ private:
 			btrfs_inode fNode;
 };
 
+
 /*!The Vnode class provides a convenience layer upon get_vnode(), so that
  * you don't have to call put_vnode() anymore, which may make code more
  * readable in some cases
diff --git a/src/add-ons/kernel/file_systems/btrfs/Volume.cpp b/src/add-ons/kernel/file_systems/btrfs/Volume.cpp
index efa7140e04..21a595c881 100644
--- a/src/add-ons/kernel/file_systems/btrfs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/btrfs/Volume.cpp
@@ -521,7 +521,7 @@ status_t
 Volume::WriteSuperBlock()
 {
 	uint32 checksum = calculate_crc((uint32)~1,
-			(uint8 *)&fSuperBlock + sizeof(fSuperBlock.checksum),
+			(uint8*)&fSuperBlock + sizeof(fSuperBlock.checksum),
 			sizeof(fSuperBlock) - sizeof(fSuperBlock.checksum));
 
 	fSuperBlock.checksum[0] = (checksum >>  0) & 0xFF;
diff --git a/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp b/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp
index 7ec26ef595..32a25d98dc 100644
--- a/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp
+++ b/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp
@@ -17,20 +17,20 @@ parse_initialize_parameters(const char* parameterString,
 {
 	parameters.verbose = false;
 
-	void *handle = parse_driver_settings_string(parameterString);
+	void* handle = parse_driver_settings_string(parameterString);
 	if (handle == NULL)
 		return B_ERROR;
 
 	if (get_driver_boolean_parameter(handle, "verbose", false, true))
 		parameters.verbose = true;
 
-	const char *ss_string = get_driver_parameter(handle, "sector_size",
+	const char* ss_string = get_driver_parameter(handle, "sector_size",
 		NULL, NULL);
 	uint32 sectorSize = B_PAGE_SIZE;
 	if (ss_string != NULL)
 		sectorSize = strtoul(ss_string, NULL, 0);
 
-	const char *bs_string = get_driver_parameter(handle, "block_size",
+	const char* bs_string = get_driver_parameter(handle, "block_size",
 		NULL, NULL);
 	uint32 blockSize = max_c(16384, B_PAGE_SIZE);
 	if (bs_string != NULL)