Ticket #13513: 0001-Code-refactoring.patch

src/add-ons/kernel/file_systems/btrfs/Attribute.cpp

@@ -8 +8 @@
 //! connection between pure inode and kernel_interface attributes
 
 
-#include "Attribute.h"
-
 #include <new>
-#include <stdio.h>
-#include <stdlib.h>
 
+#include "Attribute.h"
 #include "BPlusTree.h"
 #include "CRCTable.h"
 #include "Utility.h"
@@ -92 +89 @@
     TRACE("Stat\n");
 
     size_t nameLength = strlen(fName);
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t length;
     status_t status = _Lookup(fName, nameLength, &entries, &length);
     if (status < B_OK)
         return status;
 
-    btrfs_dir_entry *entry;
+    btrfs_dir_entry* entry;
     status = _FindEntry(entries, length, fName, nameLength, &entry);
     if (status != B_OK) {
         free(entries);
@@ -120 +117 @@
         return ERANGE;
 
     size_t nameLength = strlen(fName);
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t length;
     status_t status = _Lookup(fName, nameLength, &entries, &length);
     if (status < B_OK)
         return status;
 
-    btrfs_dir_entry *entry;
+    btrfs_dir_entry* entry;
     status = _FindEntry(entries, length, fName, nameLength, &entry);
     if (status != B_OK) {
         free(entries);
@@ -149 +146 @@
 
 status_t
 Attribute::_Lookup(const char* name, size_t nameLength,
-    btrfs_dir_entry **_entries, size_t *_length)
+    btrfs_dir_entry** _entries, size_t* _length)
 {
     uint32 hash = calculate_crc((uint32)~1, (uint8*)name, nameLength);
     struct btrfs_key key;
@@ -157 +154 @@
     key.SetObjectID(fInode->ID());
     key.SetOffset(hash);
 
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t length;
     status_t status = fInode->GetVolume()->FSTree()->FindExact(key,
         (void**)&entries, &length);
@@ -180 +177 @@
 
 
 status_t
-Attribute::_FindEntry(btrfs_dir_entry *entries, size_t length,
-    const char* name, size_t nameLength, btrfs_dir_entry **_entry)
+Attribute::_FindEntry(btrfs_dir_entry* entries, size_t length,
+    const char* name, size_t nameLength, btrfs_dir_entry** _entry)
 {
-    btrfs_dir_entry *entry = entries;
+    btrfs_dir_entry* entry = entries;
     uint16 current = 0;
     while (current < length) {
         current += entry->Length();
         break;
         // TODO there could be several entries with the same name hash
-        entry = (btrfs_dir_entry *)((uint8*)entry + entry->Length());
+        entry = (btrfs_dir_entry*)((uint8*)entry + entry->Length());
     }
     
     *_entry = entry;

src/add-ons/kernel/file_systems/btrfs/Attribute.h

@@ -7 +7 @@
 #define ATTRIBUTE_H
 
 
+#ifndef FS_SHELL
+#   include <stdio.h>
+#   include <stdlib.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
+
 #include "CachedBlock.h"
 #include "Inode.h"
 
@@ -21 +28 @@
 
 class Attribute {
 public:
-                                Attribute(Inode* inode);
-                                Attribute(Inode* inode, attr_cookie* cookie);
-                                ~Attribute();
-
-            status_t            CheckAccess(const char* name, int openMode);
-
-            status_t            Create(const char* name, type_code type,
-                                    int openMode, attr_cookie** _cookie);
-            status_t            Open(const char* name, int openMode,
-                                    attr_cookie** _cookie);
-
-            status_t            Stat(struct stat& stat);
+    Attribute(Inode* inode);
+    Attribute(Inode* inode, attr_cookie* cookie);
+    ~Attribute();
+
+    status_t    CheckAccess(const char* name, int openMode);
+    status_t    Create(const char* name, type_code type,
+                    int openMode, attr_cookie** _cookie);
+    status_t    Open(const char* name, int openMode,
+                    attr_cookie** _cookie);
+    status_t    Stat(struct stat& stat);
+    status_t    Read(attr_cookie* cookie, off_t pos, uint8* buffer, size_t* _length);
 
-            status_t            Read(attr_cookie* cookie, off_t pos,
-                                    uint8* buffer, size_t* _length);
 private:
-            status_t            _Lookup(const char* name, size_t nameLength,
-                                    btrfs_dir_entry **entries = NULL,
-                                    size_t *length = NULL);
-            status_t            _FindEntry(btrfs_dir_entry *entries,
-                                    size_t length, const char* name,
-                                    size_t nameLength,
-                                    btrfs_dir_entry **_entry);
-
-            ::Volume*           fVolume;
-            Inode*              fInode;
-            const char*         fName;
+    status_t    _Lookup(const char* name, size_t nameLength,
+                    btrfs_dir_entry** entries = NULL,
+                    size_t* length = NULL);
+    status_t    _FindEntry(btrfs_dir_entry* entries,
+                    size_t length, const char* name,
+                    size_t nameLength,
+                    btrfs_dir_entry** _entry);
+
+    ::Volume*   fVolume;
+    Inode*      fInode;
+    const char* fName;
 };
 
 #endif  // ATTRIBUTE_H

src/add-ons/kernel/file_systems/btrfs/AttributeIterator.cpp

@@ -4 +4 @@
  */
 
 
-#include "AttributeIterator.h"
-
 #include <new>
-#include <stdlib.h>
-
+#include "AttributeIterator.h"
 
 //#define TRACE_BTRFS
 #ifdef TRACE_BTRFS
@@ -50 +47 @@
 AttributeIterator::GetNext(char* name, size_t* _nameLength)
 {
     btrfs_key key;
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t entries_length;
     status_t status = fIterator->GetPreviousEntry(key, (void**)&entries,
         &entries_length);
     if (status != B_OK)
         return status;
 
-    btrfs_dir_entry *entry = entries;
+    btrfs_dir_entry* entry = entries;
     uint16 current = 0;
     while (current < entries_length) {
         current += entry->Length();
         break;
         // TODO there could be several entries with the same name hash
-        entry = (btrfs_dir_entry *)((uint8*)entry + entry->Length());
+        entry = (btrfs_dir_entry*)((uint8*)entry + entry->Length());
     }
 
     TRACE("DirectoryIterator::GetNext() entries_length %ld name_length %d\n",

src/add-ons/kernel/file_systems/btrfs/AttributeIterator.h

@@ -2 +2 @@
  * Copyright 2011, Jérôme Duval, korli@users.berlios.de.
  * This file may be used under the terms of the MIT License.
  */
+
 #ifndef ATTRIBUTEITERATOR_H
 #define ATTRIBUTEITERATOR_H
 
 
+#ifndef FS_SHELL
+#   include <stdlib.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
+
 #include "BPlusTree.h"
 #include "Inode.h"
 
-
 class AttributeIterator {
 public:
-                                AttributeIterator(Inode* inode);
-                                ~AttributeIterator();
+    AttributeIterator(Inode* inode);
+    ~AttributeIterator();
+
+    status_t    InitCheck();
+    status_t    GetNext(char* name, size_t* _nameLength);
+    status_t    Rewind();
 
-            status_t            InitCheck();
 
-            status_t            GetNext(char* name, size_t* _nameLength);
-            status_t            Rewind();
 private:
-            uint64              fOffset;
-            Inode*              fInode;
-            TreeIterator*       fIterator;
+    uint64  fOffset;
+    Inode*  fInode;
+    TreeIterator*   fIterator;
 };
 
-
 #endif  // ATTRIBUTEITERATOR_H

src/add-ons/kernel/file_systems/btrfs/BPlusTree.cpp

@@ -9 +9 @@
 
 
 #include "BPlusTree.h"
-
 #include "CachedBlock.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <util/AutoLock.h>
-
-
 //#define TRACE_BTRFS
 #ifdef TRACE_BTRFS
 #   define TRACE(x...) dprintf("\33[34mbtrfs:\33[0m " x)
@@ -26 +20 @@
 #   define ERROR(x...) dprintf("\33[34mbtrfs:\33[0m " x)
 
 
-BPlusTree::BPlusTree(Volume* volume, struct btrfs_stream *stream)
+BPlusTree::BPlusTree(Volume* volume, struct btrfs_stream* stream)
     :
     fStream(stream),
     fRootBlock(0),
@@ -62 +56 @@
 
 
 int32
-BPlusTree::_CompareKeys(struct btrfs_key &key1, struct btrfs_key &key2)
+BPlusTree::_CompareKeys(struct btrfs_key& key1, struct btrfs_key& key2)
 {
     if (key1.ObjectID() > key2.ObjectID())
         return 1;
@@ -86 +80 @@
     It can also return other errors to indicate that something went wrong.
 */
 status_t
-BPlusTree::_Find(struct btrfs_key &key, void** _value, size_t* _size,
+BPlusTree::_Find(struct btrfs_key& key, void** _value, size_t* _size,
     bplustree_traversing type)
 {
     TRACE("Find() objectid %" B_PRId64 " type %d offset %" B_PRId64 " \n",
         key.ObjectID(), key.Type(), key.Offset());
-    btrfs_stream *stream = fStream;
+    btrfs_stream* stream = fStream;
     CachedBlock cached(fVolume);
     fsblock_t physical;
     if (stream == NULL) {
@@ -99 +93 @@
             ERROR("Find() unmapped block %" B_PRId64 "\n", fRootBlock);
             return B_ERROR;
         }
-        stream = (btrfs_stream *)cached.SetTo(physical);
+        stream = (btrfs_stream*)cached.SetTo(physical);
     }
 
     while (stream->header.Level() != 0) {
@@ -123 +117 @@
                 stream->index[i - 1].BlockNum());
             return B_ERROR;
         }
-        stream = (btrfs_stream *)cached.SetTo(physical);
+        stream = (btrfs_stream*)cached.SetTo(physical);
     }
 
     uint32 i;
@@ -175 +169 @@
             if ((fVolume->BlockSize() - totalOffset % fVolume->BlockSize())
                 >= stream->entries[i].Size()) {
                 //If there is enough space for *_value
-                memcpy(*_value, ((uint8 *)cached.SetTo(physical
+                memcpy(*_value, ((uint8*)cached.SetTo(physical
                     + totalOffset / fVolume->BlockSize())
                     + totalOffset % fVolume->BlockSize()),
                     stream->entries[i].Size());
@@ -201 +195 @@
 
 
 status_t
-BPlusTree::FindNext(struct btrfs_key &key, void** _value, size_t* _size)
+BPlusTree::FindNext(struct btrfs_key& key, void** _value, size_t* _size)
 {
     return _Find(key, _value, _size, BPLUSTREE_FORWARD);
 }
 
 
 status_t
-BPlusTree::FindPrevious(struct btrfs_key &key, void** _value, size_t* _size)
+BPlusTree::FindPrevious(struct btrfs_key& key, void** _value, size_t* _size)
 {
     return _Find(key, _value, _size, BPLUSTREE_BACKWARD);
 }
 
 
 status_t
-BPlusTree::FindExact(struct btrfs_key &key, void** _value, size_t* _size)
+BPlusTree::FindExact(struct btrfs_key& key, void** _value, size_t* _size)
 {
     return _Find(key, _value, _size, BPLUSTREE_EXACT);
 }
@@ -240 +234 @@
 //  #pragma mark -
 
 
-TreeIterator::TreeIterator(BPlusTree* tree, struct btrfs_key &key)
+TreeIterator::TreeIterator(BPlusTree* tree, struct btrfs_key& key)
     :
     fTree(tree),
     fCurrentKey(key)
@@ -260 +254 @@
 /*! Iterates through the tree in the specified direction.
 */
 status_t
-TreeIterator::Traverse(bplustree_traversing direction, struct btrfs_key &key,
+TreeIterator::Traverse(bplustree_traversing direction, struct btrfs_key& key,
     void** value, size_t* size)
 {
     if (fTree == NULL)
@@ -281 +275 @@
 /*! just sets the current key in the iterator.
 */
 status_t
-TreeIterator::Find(struct btrfs_key &key)
+TreeIterator::Find(struct btrfs_key& key)
 {
     if (fTree == NULL)
         return B_INTERRUPTED;

src/add-ons/kernel/file_systems/btrfs/BPlusTree.h

@@ -7 +7 @@
 #define B_PLUS_TREE_H
 
 
-#include "btrfs.h"
-
-#include <util/SinglyLinkedList.h>
+#ifndef FS_SHELL
+#   include <stdlib.h>
+#   include <string.h>
+#   include <util/AutoLock.h>
+#   include <util/SinglyLinkedList.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
+#include "btrfs.h"
 #include "Volume.h"
 
 
-#define BPLUSTREE_NULL          -1LL
-#define BPLUSTREE_FREE          -2LL
+#define BPLUSTREE_NULL -1LL
+#define BPLUSTREE_FREE -2LL
 
 
 enum bplustree_traversing {
@@ -43 +49 @@
 
 class BPlusTree {
 public:
-                                BPlusTree(Volume* volume,
-                                    struct btrfs_stream *stream);
-                                BPlusTree(Volume* volume,
-                                    fsblock_t rootBlock);
-                                ~BPlusTree();
-            status_t            FindExact(struct btrfs_key &key, void** value,
-                                    size_t* size = NULL);
-            status_t            FindNext(struct btrfs_key &key, void** value,
-                                    size_t* size = NULL);
-            status_t            FindPrevious(struct btrfs_key &key, void** value,
-                                    size_t* size = NULL);
+    BPlusTree(Volume* volume, struct btrfs_stream* stream);
+    BPlusTree(Volume* volume, fsblock_t rootBlock);
+    ~BPlusTree();
+
+    status_t    FindExact(struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
+    status_t    FindNext(struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
+    status_t    FindPrevious(struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
 
 private:
-                                BPlusTree(const BPlusTree& other);
-                                BPlusTree& operator=(const BPlusTree& other);
-                                    // no implementation
-
-            int32               _CompareKeys(struct btrfs_key &key1,
-                                    struct btrfs_key &key2);
-            status_t            _Find(struct btrfs_key &key, void** value,
-                                    size_t* size, bplustree_traversing type);
-            void                _AddIterator(TreeIterator* iterator);
-            void                _RemoveIterator(TreeIterator* iterator);
+    BPlusTree(const BPlusTree& other);
+    BPlusTree& operator=(const BPlusTree& other);
+            // no implementation
+
+    int32   _CompareKeys(struct btrfs_key& key1,
+                struct btrfs_key& key2);
+    status_t    _Find(struct btrfs_key& key, void** value,
+                    size_t* size, bplustree_traversing type);
+    void    _AddIterator(TreeIterator* iterator);
+    void    _RemoveIterator(TreeIterator* iterator);
+
+
 private:
-            friend class TreeIterator;
+    friend class TreeIterator;
 
-            struct btrfs_stream* fStream;
-            fsblock_t           fRootBlock;
-            Volume*             fVolume;
-            mutex               fIteratorLock;
-            SinglyLinkedList<TreeIterator> fIterators;
+    struct btrfs_stream* fStream;
+    fsblock_t   fRootBlock;
+    Volume* fVolume;
+    mutex   fIteratorLock;
+    SinglyLinkedList<TreeIterator> fIterators;
 };
 
 
 class TreeIterator : public SinglyLinkedListLinkImpl<TreeIterator> {
 public:
-                                TreeIterator(BPlusTree* tree, struct btrfs_key &key);
-                                ~TreeIterator();
-
-            status_t            Traverse(bplustree_traversing direction,
-                                    struct btrfs_key &key, void** value,
-                                    size_t *size = NULL);
-            status_t            Find(struct btrfs_key &key);
-
-            status_t            Rewind();
-            status_t            GetNextEntry(struct btrfs_key &key, void** value,
-                                    size_t *size = NULL);
-            status_t            GetPreviousEntry(struct btrfs_key &key, void** value,
-                                    size_t *size = NULL);
-
-            BPlusTree*          Tree() const { return fTree; }
+    TreeIterator(BPlusTree* tree, struct btrfs_key& key);
+    ~TreeIterator();
+
+    status_t    Traverse(bplustree_traversing direction,
+                    struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
+    status_t    Find(struct btrfs_key& key);
+    status_t    Rewind();
+    status_t    GetNextEntry(struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
+    status_t    GetPreviousEntry(struct btrfs_key& key, void** value,
+                    size_t* size = NULL);
+    BPlusTree*  Tree() const { return fTree; }
 
 private:
-            friend class BPlusTree;
+    friend class BPlusTree;
 
-            // called by BPlusTree
-            void                Stop();
+    // called by BPlusTree
+    void    Stop();
 
 private:
-            BPlusTree*          fTree;
-            struct btrfs_key    fCurrentKey;
+    BPlusTree*  fTree;
+    struct btrfs_key    fCurrentKey;
 };
 
 
@@ -117 +122 @@
     return B_OK;
 }
 
+
 inline status_t
-TreeIterator::GetNextEntry(struct btrfs_key &key, void** value, size_t *size)
+TreeIterator::GetNextEntry(struct btrfs_key& key, void** value, size_t* size)
 {
     return Traverse(BPLUSTREE_FORWARD, key, value, size);
 }
 
+
 inline status_t
-TreeIterator::GetPreviousEntry(struct btrfs_key &key, void** value,
-    size_t *size)
+TreeIterator::GetPreviousEntry(struct btrfs_key& key, void** value, size_t* size)
 {
     return Traverse(BPLUSTREE_BACKWARD, key, value, size);
 }
 
 
-
 #endif  // B_PLUS_TREE_H

src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp

@@ -7 +7 @@
  */
 
 
-#include <SupportDefs.h>
+#ifndef FS_SHELL
+#   include <SupportDefs.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
 
 //! CRC 03667067501 table, as generated by crc_table.cpp
 static uint32 kCrcTable[256] = { 
-    0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, 
-    0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, 
-    0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, 
-    0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, 
-    0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, 
-    0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, 
-    0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, 
-    0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, 
-    0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, 
-    0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, 
-    0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, 
-    0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, 
-    0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, 
-    0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, 
-    0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, 
-    0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, 
-    0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, 
-    0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, 
-    0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, 
-    0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, 
-    0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, 
-    0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, 
-    0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, 
-    0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, 
-    0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, 
-    0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, 
-    0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, 
-    0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, 
-    0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, 
-    0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, 
-    0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, 
-    0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351 
+    0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, 
+    0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, 
+    0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, 
+    0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, 
+    0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, 
+    0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, 
+    0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, 
+    0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, 
+    0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, 
+    0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, 
+    0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, 
+    0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, 
+    0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, 
+    0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, 
+    0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, 
+    0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, 
+    0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, 
+    0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, 
+    0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, 
+    0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, 
+    0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, 
+    0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, 
+    0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, 
+    0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, 
+    0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, 
+    0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, 
+    0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, 
+    0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, 
+    0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, 
+    0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, 
+    0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, 
+    0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351 
 };
 
 
@@ -58 +62 @@
     \return The crc checksum, or 0 if an error occurred.
 */
 uint32
-calculate_crc(uint32 crc, uint8 *data, uint16 length)
+calculate_crc(uint32 crc, uint8* data, uint16 length)
 {
     if (data) {
         for ( ; length > 0; length--, data++)

src/add-ons/kernel/file_systems/btrfs/CRCTable.h

@@ -6 +6 @@
  *      Jérôme Duval
  */
 
-uint32 calculate_crc(uint32 crc, uint8 *data, uint16 length);
-
+uint32 calculate_crc(uint32 crc, uint8* data, uint16 length);

src/add-ons/kernel/file_systems/btrfs/CachedBlock.h

@@ -7 +7 @@
 
 //! interface for the block cache
 
-#include <fs_cache.h>
+
+#ifndef FS_SHELL
+#   include <fs_cache.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
 #include "Volume.h"
 
 
 class CachedBlock {
 public:
-                            CachedBlock(Volume* volume);
-                            CachedBlock(Volume* volume, off_t block);
-                            ~CachedBlock();
+    CachedBlock(Volume* volume);
+    CachedBlock(Volume* volume, off_t block);
+    ~CachedBlock();
 
-            void            Keep();
-            void            Unset();
+    void    Keep();
+    void    Unset();
 
-            const uint8*    SetTo(off_t block);
+    const uint8*    SetTo(off_t block);
 
-            const uint8*    Block() const { return fBlock; }
-            off_t           BlockNumber() const { return fBlockNumber; }
+    const uint8*    Block() const { return fBlock; }
+    off_t   BlockNumber() const { return fBlockNumber; }
 
 private:
-                            CachedBlock(const CachedBlock &);
-                            CachedBlock &operator=(const CachedBlock &);
-                                // no implementation
-                        
+    CachedBlock(const CachedBlock&);
+    CachedBlock& operator=(const CachedBlock&);
+    // no implementation
+
 protected:
-            Volume*         fVolume;
-            off_t           fBlockNumber;
-            uint8*          fBlock;
+    Volume* fVolume;
+    off_t   fBlockNumber;
+    uint8*  fBlock;
 };
 
 
@@ -91 +96 @@
 {
     Unset();
     fBlockNumber = block;
-    return fBlock = (uint8 *)block_cache_get(fVolume->BlockCache(), block);
+    return fBlock = (uint8*)block_cache_get(fVolume->BlockCache(), block);
 }
 
 #endif  // CACHED_BLOCK_H

src/add-ons/kernel/file_systems/btrfs/Chunk.cpp

@@ -3 +3 @@
  * This file may be used under the terms of the MIT License.
  *
  * Authors:
- *      Jérôme Duval
+ *  Jérôme Duval
  */
 
 
 #include "Chunk.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 
 //#define TRACE_BTRFS
 #ifdef TRACE_BTRFS
@@ -43 +40 @@
         "sector_size %" B_PRIu32 "\n", chunk->Length(), chunk->Owner(), 
         chunk->StripeLength(), chunk->Type(), chunk->StripeCount(), 
         chunk->SubStripes(), chunk->SectorSize());
-    for(int32 i = 0; i < chunk->StripeCount(); i++) {
+    for (int32 i = 0; i < chunk->StripeCount(); i++) {
         TRACE("chunk.stripe[%" B_PRId32 "].physical %" B_PRId64 " deviceid %"
             B_PRId64 "\n", i, chunk->stripes[i].Offset(),
             chunk->stripes[i].DeviceID());
@@ -66 +63 @@
 
 
 status_t
-Chunk::FindBlock(off_t logical, off_t &physical)
+Chunk::FindBlock(off_t logical, off_t& physical)
 {
     if (fChunk == NULL)
         return B_NO_INIT;

src/add-ons/kernel/file_systems/btrfs/Chunk.h

@@ -5 +5 @@
  * Authors:
  *      Jérôme Duval
  */
+
 #ifndef CHUNK_H
 #define CHUNK_H
 
 
+#ifndef FS_SHELL
+#   include <stdlib.h>
+#   include <string.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
+
 #include "btrfs.h"
 
 
 class Chunk {
 public:
-                                Chunk(struct btrfs_chunk* chunk,
-                                    fsblock_t offset);
-                                ~Chunk();
-            uint32              Size() const;
-            status_t            FindBlock(off_t logical, off_t &physical);
-            fsblock_t           Offset() const { return fChunkOffset; }
-            fsblock_t           End() const 
-                                    { return fChunkOffset + fChunk->Length(); }
+    Chunk(struct btrfs_chunk* chunk,
+        fsblock_t offset);
+    ~Chunk();
+    uint32  Size() const;
+    status_t    FindBlock(off_t logical, off_t& physical);
+    fsblock_t   Offset() const { return fChunkOffset; }
+    fsblock_t   End() const 
+        { return fChunkOffset + fChunk->Length(); }
 private:
-            struct btrfs_chunk* fChunk;
-            fsblock_t           fChunkOffset;
-            status_t            fInitStatus;
+    struct btrfs_chunk* fChunk;
+    fsblock_t   fChunkOffset;
+    status_t    fInitStatus;
 };
 
+
 #endif  // CHUNK_H

src/add-ons/kernel/file_systems/btrfs/DirectoryIterator.cpp

@@ -5 +5 @@
 
 
 #include "DirectoryIterator.h"
-
-#include <new>
-#include <stdlib.h>
-
 #include "CRCTable.h"
 
 
@@ -73 +69 @@
     }
 
     btrfs_key key;
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t entries_length;
     status_t status = fIterator->GetNextEntry(key, (void**)&entries,
         &entries_length);
     if (status != B_OK)
         return status;
 
-    btrfs_dir_entry *entry = entries;
+    btrfs_dir_entry* entry = entries;
     uint16 current = 0;
     while (current < entries_length) {
         current += entry->Length();
         break;
         // TODO there could be several entries with the same name hash
-        entry = (btrfs_dir_entry *)((uint8*)entry + entry->Length());
+        entry = (btrfs_dir_entry*)((uint8*)entry + entry->Length());
     }
 
     size_t length = entry->NameLength();
@@ -127 +123 @@
     key.SetObjectID(fInode->ID());
     key.SetOffset(hash);
 
-    btrfs_dir_entry *entries;
+    btrfs_dir_entry* entries;
     size_t length;
     status_t status = fInode->GetVolume()->FSTree()->FindExact(key,
         (void**)&entries, &length);
@@ -137 +133 @@
         return status;
     }
 
-    btrfs_dir_entry *entry = entries;
+    btrfs_dir_entry* entry = entries;
     uint16 current = 0;
     while (current < length) {
         current += entry->Length();
         break;
         // TODO there could be several entries with the same name hash
-        entry = (btrfs_dir_entry *)((uint8*)entry + entry->Length());
+        entry = (btrfs_dir_entry*)((uint8*)entry + entry->Length());
     }
 
     TRACE("DirectoryIterator::Lookup() entries_length %ld name_length %d\n",

src/add-ons/kernel/file_systems/btrfs/DirectoryIterator.h

@@ -6 +6 @@
 #define DIRECTORYITERATOR_H
 
 
+#ifndef FS_SHELL
+#   include <new>
+#   include <stdlib.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 #include "BPlusTree.h"
 #include "Inode.h"
 
 
 class DirectoryIterator {
 public:
-                                DirectoryIterator(Inode* inode);
-                                ~DirectoryIterator();
+    DirectoryIterator(Inode* inode);
+    ~DirectoryIterator();
 
-            status_t            InitCheck();
+    status_t    InitCheck();
 
-            status_t            GetNext(char* name, size_t* _nameLength, ino_t* _id);
-            status_t            Lookup(const char* name, size_t nameLength, ino_t* _id);
-            status_t            Rewind();
+    status_t    GetNext(char* name, size_t* _nameLength, ino_t* _id);
+    status_t    Lookup(const char* name, size_t nameLength, ino_t* _id);
+    status_t    Rewind();
 private:
-            uint64              fOffset;
-            Inode*              fInode;
-            TreeIterator*       fIterator;
+    uint64  fOffset;
+    Inode*  fInode;
+    TreeIterator*   fIterator;
 };
 
 

src/add-ons/kernel/file_systems/btrfs/Inode.cpp

@@ -5 +5 @@
  * This file may be used under the terms of the MIT License.
  */
 
-
-#include "Inode.h"
-
-#include <string.h>
-#include <stdlib.h>
 #include <zlib.h>
 
+#include "Inode.h"
 #include "BPlusTree.h"
 #include "CachedBlock.h"
 #include "Utility.h"
@@ -84 +80 @@
     search_key.SetObjectID(fID);
     search_key.SetOffset(0);
 
-    struct btrfs_inode *node;
+    struct btrfs_inode* node;
     if (fVolume->FSTree()->FindExact(search_key, (void**)&node) != B_OK) {
         ERROR("Inode::UpdateNodeFromDisk(): Couldn't find inode %"
             B_PRIdINO "\n", fID);
@@ -110 +106 @@
 
 
 status_t
-Inode::FindBlock(off_t pos, off_t& physical, off_t *_length)
+Inode::FindBlock(off_t pos, off_t& physical, off_t* _length)
 {
     struct btrfs_key search_key;
     search_key.SetType(BTRFS_KEY_TYPE_EXTENT_DATA);
     search_key.SetObjectID(fID);
     search_key.SetOffset(pos + 1);
 
-    btrfs_extent_data *extent_data;
+    btrfs_extent_data* extent_data;
     status_t status = fVolume->FSTree()->FindPrevious(search_key,
         (void**)&extent_data);
     if (status != B_OK) {
@@ -173 +169 @@
     search_key.SetOffset(pos + 1);
 
     size_t item_size;
-    btrfs_extent_data *extent_data;
+    btrfs_extent_data* extent_data;
     status_t status = fVolume->FSTree()->FindPrevious(search_key,
         (void**)&extent_data, &item_size);
     if (status != B_OK) {
@@ -291 +287 @@
 
 
 status_t
-Inode::FindParent(ino_t *id)
+Inode::FindParent(ino_t* id)
 {
     struct btrfs_key search_key;
     search_key.SetType(BTRFS_KEY_TYPE_INODE_REF);
     search_key.SetObjectID(fID);
     search_key.SetOffset(-1);
 
-    void *node_ref;
+    void* node_ref;
     if (fVolume->FSTree()->FindPrevious(search_key, &node_ref) != B_OK) {
         ERROR("Inode::FindParent(): Couldn't find inode for %" B_PRIdINO "\n",
             fID);

src/add-ons/kernel/file_systems/btrfs/Inode.h

@@ -7 +7 @@
 #define INODE_H
 
 
-#include <fs_cache.h>
-#include <lock.h>
-#include <string.h>
+#ifndef FS_SHELL
+#   include <stdlib.h>
+#   include <fs_cache.h>
+#   include <lock.h>
+#   include <string.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
 #include "btrfs.h"
 #include "Volume.h"
@@ -25 +30 @@
 
 class Inode {
 public:
-                        Inode(Volume* volume, ino_t id);
-                        ~Inode();
-
-            status_t    InitCheck();
-
-            ino_t       ID() const { return fID; }
-
-            rw_lock*    Lock() { return &fLock; }
-
-            status_t    UpdateNodeFromDisk();
-
-            bool        IsDirectory() const
-                            { return S_ISDIR(Mode()); }
-            bool        IsFile() const
-                            { return S_ISREG(Mode()); }
-            bool        IsSymLink() const
-                            { return S_ISLNK(Mode()); }
-            status_t    CheckPermissions(int accessMode) const;
-
-            mode_t      Mode() const { return fNode.Mode(); }
-            off_t       Size() const { return fNode.Size(); }
-            uid_t       UserID() const { return fNode.UserID(); }
-            gid_t       GroupID() const { return fNode.GroupID(); }
-            void        GetChangeTime(struct timespec &timespec) const
-                            { fNode.GetChangeTime(timespec); }
-            void        GetModificationTime(struct timespec &timespec) const
-                            { fNode.GetModificationTime(timespec); }
-            void        GetCreationTime(struct timespec &timespec) const
-                            { fNode.GetCreationTime(timespec); }
-            void        GetAccessTime(struct timespec &timespec) const
-                            { fNode.GetCreationTime(timespec); }
-
-            Volume*     GetVolume() const { return fVolume; }
-
-            status_t    FindBlock(off_t logical, off_t& physical,
-                            off_t *_length = NULL);
-            status_t    ReadAt(off_t pos, uint8 *buffer, size_t *length);
-            status_t    FillGapWithZeros(off_t start, off_t end);
-
-            void*       FileCache() const { return fCache; }
-            void*       Map() const { return fMap; }
-            
-            status_t    FindParent(ino_t *id);
+    Inode(Volume* volume, ino_t id);
+    ~Inode();
+    
+    status_t    InitCheck();
+    ino_t   ID() const { return fID; }
+    rw_lock*    Lock() { return& fLock; }
+    status_t    UpdateNodeFromDisk();
+    
+    bool    IsDirectory() const
+        { return S_ISDIR(Mode()); }
+    bool    IsFile() const
+        { return S_ISREG(Mode()); }
+    bool    IsSymLink() const
+        { return S_ISLNK(Mode()); }
+    status_t    CheckPermissions(int accessMode) const;
+    mode_t  Mode() const { return fNode.Mode(); }
+    off_t   Size() const { return fNode.Size(); }
+    uid_t   UserID() const { return fNode.UserID(); }
+    gid_t   GroupID() const { return fNode.GroupID(); }
+    void    GetChangeTime(struct timespec& timespec) const
+        { fNode.GetChangeTime(timespec); }
+    void    GetModificationTime(struct timespec& timespec) const
+        { fNode.GetModificationTime(timespec); }
+    void    GetCreationTime(struct timespec& timespec) const
+        { fNode.GetCreationTime(timespec); }
+    void    GetAccessTime(struct timespec& timespec) const
+        { fNode.GetCreationTime(timespec); }
+    Volume* GetVolume() const { return fVolume; }
+    status_t    FindBlock(off_t logical, off_t& physical,
+        off_t* _length = NULL);
+    status_t    ReadAt(off_t pos, uint8* buffer, size_t* length);
+    status_t    FillGapWithZeros(off_t start, off_t end);
+    void*   FileCache() const { return fCache; }
+    void*   Map() const { return fMap; }
+    status_t    FindParent(ino_t* id);
 private:
-                        Inode(Volume* volume);
-                        Inode(const Inode&);
-                        Inode &operator=(const Inode&);
-                            // no implementation
-
-            uint64      _NumBlocks();
-
-            rw_lock     fLock;
-            ::Volume*   fVolume;
-            ino_t       fID;
-            void*       fCache;
-            void*       fMap;
-            status_t    fInitStatus;
-            struct btrfs_inode fNode;
+    Inode(Volume* volume);
+    Inode(const Inode&);
+    Inode& operator=(const Inode&);
+    // no implementation
+
+    uint64  _NumBlocks();
+    rw_lock fLock;
+    ::Volume*   fVolume;
+    ino_t   fID;
+    void*   fCache;
+    void*   fMap;
+    status_t    fInitStatus;
+    struct btrfs_inode fNode;
 };
 
 
@@ -98 +94 @@
     {
         SetTo(volume, id);
     }
-
+    
     Vnode()
         :
         fStatus(B_NO_INIT),
         fInode(NULL)
     {
     }
-
+    
     ~Vnode()
     {
         Unset();
     }
-
+    
     status_t InitCheck()
     {
         return fStatus;
     }
-
+    
     void Unset()
     {
         if (fInode != NULL) {
@@ -124 +120 @@
             fStatus = B_NO_INIT;
         }
     }
-
+    
     status_t SetTo(Volume* volume, ino_t id)
     {
         Unset();
-
         return fStatus = get_vnode(volume->FSVolume(), id, (void**)&fInode);
     }
-
+    
     status_t Get(Inode** _inode)
     {
         *_inode = fInode;
         return fStatus;
     }
-
+    
     void Keep()
     {
         TRACEI("Vnode::Keep()\n");
@@ -146 +141 @@
 
 private:
     status_t    fStatus;
-    Inode*      fInode;
+    Inode*  fInode;
 };
 
 #endif  // INODE_H

src/add-ons/kernel/file_systems/btrfs/Utility.h

@@ -10 +10 @@
 
 
 enum inode_type {
-    S_DIRECTORY     = S_IFDIR,
-    S_FILE          = S_IFREG,
-    S_SYMLINK       = S_IFLNK,
-
-    S_INDEX_TYPES   = (S_STR_INDEX | S_INT_INDEX | S_UINT_INDEX
-                        | S_LONG_LONG_INDEX | S_ULONG_LONG_INDEX
-                        | S_FLOAT_INDEX | S_DOUBLE_INDEX),
-
+    S_DIRECTORY = S_IFDIR,
+    S_FILE  = S_IFREG,
+    S_SYMLINK   = S_IFLNK,
+    
+    S_INDEX_TYPES   =   (S_STR_INDEX | S_INT_INDEX | S_UINT_INDEX
+                            | S_LONG_LONG_INDEX | S_ULONG_LONG_INDEX
+                            | S_FLOAT_INDEX | S_DOUBLE_INDEX),
+    
     S_EXTENDED_TYPES = (S_ATTR_DIR | S_ATTR | S_INDEX_DIR)
 };
 
@@ -38 +38 @@
     return R_OK | W_OK;
 }
 
+
 #endif  // UTILITY_H

src/add-ons/kernel/file_systems/btrfs/Volume.cpp

@@ -9 +9 @@
 
 
 #include "Volume.h"
-
-#include <errno.h>
-#include <new>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <fs_cache.h>
-#include <fs_volume.h>
-
-#include <util/AutoLock.h>
-
 #include "BPlusTree.h"
 #include "CachedBlock.h"
 #include "Chunk.h"
@@ -38 +26 @@
 
 class DeviceOpener {
 public:
-                                DeviceOpener(int fd, int mode);
-                                DeviceOpener(const char* device, int mode);
-                                ~DeviceOpener();
+    DeviceOpener(int fd, int mode);
+    DeviceOpener(const char* device, int mode);
+    ~DeviceOpener();
 
-            int                 Open(const char* device, int mode);
-            int                 Open(int fd, int mode);
-            void*               InitCache(off_t numBlocks, uint32 blockSize);
-            void                RemoveCache(bool allowWrites);
+    int     Open(const char* device, int mode);
+    int     Open(int fd, int mode);
+    void*   InitCache(off_t numBlocks, uint32 blockSize);
+    void    RemoveCache(bool allowWrites);
 
-            void                Keep();
+    void    Keep();
 
-            int                 Device() const { return fDevice; }
-            int                 Mode() const { return fMode; }
-            bool                IsReadOnly() const
-                                    { return _IsReadOnly(fMode); }
+    int     Device() const { return fDevice; }
+    int     Mode() const { return fMode; }
+    bool    IsReadOnly() const { return _IsReadOnly(fMode); }
 
-            status_t            GetSize(off_t* _size, uint32* _blockSize = NULL);
+    status_t    GetSize(off_t* _size, uint32* _blockSize = NULL);
 
-private:
-    static  bool                _IsReadOnly(int mode)
-                                    { return (mode & O_RWMASK) == O_RDONLY;}
-    static  bool                _IsReadWrite(int mode)
-                                    { return (mode & O_RWMASK) == O_RDWR;}
+    private:
+    static  bool    _IsReadOnly(int mode) { return (mode & O_RWMASK) == O_RDONLY;}
+    static  bool    _IsReadWrite(int mode) { return (mode & O_RWMASK) == O_RDWR;}
 
-            int                 fDevice;
-            int                 fMode;
-            void*               fBlockCache;
+    int fDevice;
+    int fMode;
+    void*   fBlockCache;
 };
 
 
@@ -142 +127 @@
 DeviceOpener::InitCache(off_t numBlocks, uint32 blockSize)
 {
     return fBlockCache = block_cache_create(fDevice, numBlocks, blockSize,
-        IsReadOnly());
+            IsReadOnly());
 }
 
 
@@ -187 +172 @@
 
     if (_size) {
         *_size = 1ULL * geometry.head_count * geometry.cylinder_count
-            * geometry.sectors_per_track * geometry.bytes_per_sector;
+                    * geometry.sectors_per_track * geometry.bytes_per_sector;
     }
     if (_blockSize)
         *_blockSize = geometry.bytes_per_sector;
@@ -205 +190 @@
     // TODO: check some more values!
     if (strncmp(magic, BTRFS_SUPER_BLOCK_MAGIC, sizeof(magic)) != 0)
         return false;
-    
+
     return true;
 }
 
@@ -219 +204 @@
     fFlags(0),
     fChunk(NULL),
     fChunkTree(NULL)
-{
+    {
     mutex_init(&fLock, "btrfs volume");
 }
 
@@ -249 +234 @@
 
 status_t
 Volume::Mount(const char* deviceName, uint32 flags)
-{
+    {
     flags |= B_MOUNT_READ_ONLY;
-        // we only support read-only for now
-    
+    // we only support read-only for now
+
     if ((flags & B_MOUNT_READ_ONLY) != 0) {
         TRACE("Volume::Mount(): Read only\n");
     } else {
@@ -276 +261 @@
         ERROR("Volume::Mount(): Identify() failed\n");
         return status;
     }
-    
+
     fBlockSize = fSuperBlock.BlockSize();
     TRACE("block size %" B_PRIu32 "\n", fBlockSize);
 
@@ -290 +275 @@
         if (key->Type() != BTRFS_KEY_TYPE_CHUNK_ITEM) {
             break;
         }
-        
+
         struct btrfs_chunk* chunk = (struct btrfs_chunk*)(key + 1);
         fChunk = new(std::nothrow) Chunk(chunk, key->Offset());
         if (fChunk == NULL)
@@ -310 +295 @@
     FindBlock(fSuperBlock.LogRoot(), physical);
     TRACE("Volume::Mount() log_root: %" B_PRIu64 " (physical %" B_PRIu64 ")\n",
         fSuperBlock.LogRoot(), physical);
-        
+
     // check if the device size is large enough to hold the file system
     off_t diskSize;
     status = opener.GetSize(&diskSize);
@@ -323 +308 @@
         fBlockSize);
     if (fBlockCache == NULL)
         return B_ERROR;
-    
+
     TRACE("Volume::Mount(): Initialized block cache: %p\n", fBlockCache);
 
     fChunkTree = new(std::nothrow) BPlusTree(this, fSuperBlock.ChunkRoot());
@@ -348 +333 @@
     search_key.SetOffset(0);
     search_key.SetType(BTRFS_KEY_TYPE_ROOT_ITEM);
     search_key.SetObjectID(BTRFS_OBJECT_ID_EXTENT_TREE);
-    struct btrfs_root *root;
+    struct btrfs_root* root;
     if (fRootTree->FindNext(search_key, (void**)&root) != B_OK) {
         ERROR("Volume::Mount(): Couldn't find extent root\n");
         return B_ERROR;
@@ -359 +344 @@
     free(root);
     if (fExtentTree == NULL)
         return B_NO_MEMORY;
-    
+
     search_key.SetOffset(0);
     search_key.SetObjectID(BTRFS_OBJECT_ID_FS_TREE);
     if (fRootTree->FindNext(search_key, (void**)&root) != B_OK) {
@@ -371 +356 @@
     free(root);
     if (fFSTree == NULL)
         return B_NO_MEMORY;
-    
+
     search_key.SetOffset(0);
     search_key.SetObjectID(BTRFS_OBJECT_ID_DEV_TREE);
     if (fRootTree->FindNext(search_key, (void**)&root) != B_OK) {
@@ -397 +382 @@
     free(root);
     if (fChecksumTree == NULL)
         return B_NO_MEMORY;
-    
+
     // ready
     status = get_vnode(fFSVolume, BTRFS_OBJECT_ID_CHUNK_TREE,
         (void**)&fRootNode);
@@ -426 +411 @@
         }
 
         double size = double((10 * diskSize + divisor - 1) / divisor);
-            // %g in the kernel does not support precision...
+        // %g in the kernel does not support precision...
 
         snprintf(fName, sizeof(fName), "%g %cB Btrfs Volume",
             size / 10, unit);
@@ -478 +463 @@
 
 
 status_t
-Volume::FindBlock(off_t logical, fsblock_t &physicalBlock)
+Volume::FindBlock(off_t logical, fsblock_t& physicalBlock)
 {
     off_t physical;
     status_t status = FindBlock(logical, physical);
@@ -490 +475 @@
 
 
 status_t
-Volume::FindBlock(off_t logical, off_t &physical)
+Volume::FindBlock(off_t logical, off_t& physical)
 {
     if (fChunkTree == NULL
         || (logical >= (off_t)fChunk->Offset()
@@ -503 +488 @@
     search_key.SetOffset(logical);
     search_key.SetType(BTRFS_KEY_TYPE_CHUNK_ITEM);
     search_key.SetObjectID(BTRFS_OBJECT_ID_CHUNK_TREE);
-    struct btrfs_chunk *chunk;
+    struct btrfs_chunk* chunk;
     size_t chunk_length;
     status_t status = fChunkTree->FindPrevious(search_key, (void**)&chunk,
         &chunk_length);
@@ -514 +499 @@
     free(chunk);
     status = _chunk.FindBlock(logical, physical);
     if (status != B_OK)
-            return status;
+        return status;
     TRACE("Volume::FindBlock(): logical: %" B_PRIdOFF ", physical: %" B_PRIdOFF
         "\n", logical, physical);
     return B_OK;

src/add-ons/kernel/file_systems/btrfs/Volume.h

@@ -7 +7 @@
 #define VOLUME_H
 
 
-#include <lock.h>
+#ifndef FS_SHELL
+#   include <lock.h>
+#   include <errno.h>
+#   include <new>
+#   include <stdio.h>
+#   include <stdlib.h>
+#   include <string.h>
+#   include <fs_cache.h>
+#   include <fs_volume.h>
+#   include <util/AutoLock.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
 #include "btrfs.h"
 
 
 enum volume_flags {
-    VOLUME_READ_ONLY    = 0x0001
+    VOLUME_READ_ONLY = 0x0001
 };
 
+
 class BPlusTree;
 class Chunk;
 class Inode;
@@ -23 +36 @@
 
 class Volume {
 public:
-                                Volume(fs_volume* volume);
-                                ~Volume();
-
-            status_t            Mount(const char* device, uint32 flags);
-            status_t            Unmount();
+    Volume(fs_volume* volume);
+    ~Volume();
 
-            bool                IsValidSuperBlock();
-            bool                IsReadOnly() const
-                                    { return (fFlags & VOLUME_READ_ONLY) != 0; }
+    status_t    Mount(const char* device, uint32 flags);
+    status_t    Unmount();
 
-            Inode*              RootNode() const { return fRootNode; }
-            int                 Device() const { return fDevice; }
+    bool    IsValidSuperBlock();
+    bool    IsReadOnly() const
+                { return (fFlags & VOLUME_READ_ONLY) != 0; }
 
-            dev_t               ID() const
-                                    { return fFSVolume ? fFSVolume->id : -1; }
-            fs_volume*          FSVolume() const { return fFSVolume; }
-            const char*         Name() const;
-            BPlusTree*          FSTree() const { return fFSTree; }
-            BPlusTree*          RootTree() const { return fRootTree; }
+    Inode*  RootNode() const { return fRootNode; }
+    int     Device() const { return fDevice; }
 
-            uint32              BlockSize() const { return fBlockSize; }
-            btrfs_super_block&  SuperBlock() { return fSuperBlock; }
+    dev_t   ID() const
+                { return fFSVolume ? fFSVolume->id : -1; }
 
-            status_t            LoadSuperBlock();
+    fs_volume*  FSVolume() const { return fFSVolume; }
+    const char* Name() const;
+    BPlusTree*  FSTree() const { return fFSTree; }
+    BPlusTree*  RootTree() const { return fRootTree; }
+    uint32  BlockSize() const { return fBlockSize; }
+    btrfs_super_block&  SuperBlock() { return fSuperBlock; }
+    status_t    LoadSuperBlock();
 
-            // cache access
-            void*               BlockCache() { return fBlockCache; }
+    // cache access
+    void*   BlockCache() { return fBlockCache; }
 
-    static  status_t            Identify(int fd, btrfs_super_block* superBlock);
-
-            status_t            FindBlock(off_t logical, fsblock_t &physical);
-            status_t            FindBlock(off_t logical, off_t &physical);
+    static  status_t    Identify(int fd, btrfs_super_block* superBlock);
+    status_t    FindBlock(off_t logical, fsblock_t& physical);
+    status_t    FindBlock(off_t logical, off_t& physical);
 
 private:
-            mutex               fLock;
-            fs_volume*          fFSVolume;
-            int                 fDevice;
-            btrfs_super_block   fSuperBlock;
-            char                fName[32];
-
-            uint32              fFlags;
-            uint32              fBlockSize;
-
-            void*               fBlockCache;
-            Inode*              fRootNode;
-
-            Chunk*              fChunk;
-            BPlusTree*          fChunkTree;
-            BPlusTree*          fRootTree;
-            BPlusTree*          fDevTree;
-            BPlusTree*          fExtentTree;
-            BPlusTree*          fFSTree;
-            BPlusTree*          fChecksumTree;
+    mutex   fLock;
+    fs_volume*  fFSVolume;
+    int     fDevice;
+    btrfs_super_block   fSuperBlock;
+    char    fName[32];
+
+    uint32  fFlags;
+    uint32  fBlockSize;
+
+    void*   fBlockCache;
+    Inode*  fRootNode;
+
+    Chunk*  fChunk;
+    BPlusTree*  fChunkTree;
+    BPlusTree*  fRootTree;
+    BPlusTree*  fDevTree;
+    BPlusTree*  fExtentTree;
+    BPlusTree*  fFSTree;
+    BPlusTree*  fChecksumTree;
 };
 
+
 #endif  // VOLUME_H
 

src/add-ons/kernel/file_systems/btrfs/btrfs.h

@@ -6 +6 @@
 #define BTRFS_H
 
 
-#include <sys/stat.h>
+#ifndef FS_SHELL
+#   include <sys/stat.h>
+#   include <ByteOrder.h>
+#   include <fs_interface.h>
+#   include <KernelExport.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
-#include <ByteOrder.h>
-#include <fs_interface.h>
-#include <KernelExport.h>
 
-
-typedef uint64 fileblock_t;     // file block number
-typedef uint64 fsblock_t;       // filesystem block number
+typedef uint64 fileblock_t; // file block number
+typedef uint64 fsblock_t;   // filesystem block number
 
 
 #define BTRFS_SUPER_BLOCK_OFFSET    0x10000
@@ -23 +26 @@
     uint64  object_id;
     uint8   type;
     uint64  offset;
-    
     uint64  ObjectID() const { return B_LENDIAN_TO_HOST_INT64(object_id); }
     uint8   Type() const { return type; }
     uint64  Offset() const { return B_LENDIAN_TO_HOST_INT64(offset); }
@@ -32 +34 @@
     void SetOffset(uint64 off) { offset = B_HOST_TO_LENDIAN_INT64(off); }
 } _PACKED;
 
+
 struct btrfs_timespec {
     uint64  seconds;
     uint32  nanoseconds;
 } _PACKED;
 
+
 struct btrfs_header {
     uint8   checksum[32];
     uint8   fsid[16];
@@ -50 +54 @@
     uint64 BlockNum() const { return B_LENDIAN_TO_HOST_INT64(blocknum); }
     uint64 Flags() const { return B_LENDIAN_TO_HOST_INT64(flags); }
     uint64 Generation() const {
-        return B_LENDIAN_TO_HOST_INT64(generation); }
+            return B_LENDIAN_TO_HOST_INT64(generation); }
     uint64 Owner() const {
-        return B_LENDIAN_TO_HOST_INT64(owner); }
+            return B_LENDIAN_TO_HOST_INT64(owner); }
     uint32 ItemCount() const {
-        return B_LENDIAN_TO_HOST_INT32(item_count); }
+            return B_LENDIAN_TO_HOST_INT32(item_count); }
     uint8 Level() const { return level; }
 } _PACKED;
 
+
 struct btrfs_index {
     btrfs_key key;
     uint64  blocknum;
     uint64  generation;
     uint64 BlockNum() const { return B_LENDIAN_TO_HOST_INT64(blocknum); }
     uint64 Generation() const {
-        return B_LENDIAN_TO_HOST_INT64(generation); }
+            return B_LENDIAN_TO_HOST_INT64(generation); }
 } _PACKED;
 
+
 struct btrfs_entry {
     btrfs_key key;
     uint32 offset;
     uint32 size;
     uint32 Offset() const {
-        return B_LENDIAN_TO_HOST_INT32(offset); }
+            return B_LENDIAN_TO_HOST_INT32(offset); }
     uint32 Size() const {
-        return B_LENDIAN_TO_HOST_INT32(size); }
+            return B_LENDIAN_TO_HOST_INT32(size); }
 } _PACKED;
 
+
 struct btrfs_stream {
     btrfs_header header;
     union {
@@ -85 +92 @@
     };
 } _PACKED;
 
+
 struct btrfs_stripe {
     uint64  device_id;
     uint64  offset;
@@ -93 +101 @@
     uint64  Offset() const { return B_LENDIAN_TO_HOST_INT64(offset); }
 } _PACKED;
 
+
 struct btrfs_chunk {
     uint64  length;
     uint64  owner;
@@ -107 +116 @@
     uint64 Length() const { return B_LENDIAN_TO_HOST_INT64(length); }
     uint64 Owner() const { return B_LENDIAN_TO_HOST_INT64(owner); }
     uint64 StripeLength() const
-        { return B_LENDIAN_TO_HOST_INT64(stripe_length); }
+            { return B_LENDIAN_TO_HOST_INT64(stripe_length); }
     uint64 Type() const { return B_LENDIAN_TO_HOST_INT64(type); }
     uint32 IOAlign() const { return B_LENDIAN_TO_HOST_INT32(io_align); }
     uint32 IOWidth() const { return B_LENDIAN_TO_HOST_INT32(io_width); }
     uint32 SectorSize() const
-        { return B_LENDIAN_TO_HOST_INT32(sector_size); }
+            { return B_LENDIAN_TO_HOST_INT32(sector_size); }
     uint16 StripeCount() const
-        { return B_LENDIAN_TO_HOST_INT16(stripe_count); }
+            { return B_LENDIAN_TO_HOST_INT16(stripe_count); }
     uint16 SubStripes() const
-        { return B_LENDIAN_TO_HOST_INT16(sub_stripes); }
+            { return B_LENDIAN_TO_HOST_INT16(sub_stripes); }
 } _PACKED;
 
+
 struct btrfs_device {
     uint64  id;
     uint64  total_size;
@@ -171 +181 @@
     uint8   system_chunk_array[2048];
 
     bool IsValid();
-        // implemented in Volume.cpp
+            // implemented in Volume.cpp
     uint64 TotalSize() const { return B_LENDIAN_TO_HOST_INT64(total_size); }
     uint32 BlockSize() const { return B_LENDIAN_TO_HOST_INT32(sector_size); }
     uint64 RootDirObjectID() const {
-        return B_LENDIAN_TO_HOST_INT64(root_dir_object_id); }
+            return B_LENDIAN_TO_HOST_INT64(root_dir_object_id); }
     uint64 Generation() const {
-        return B_LENDIAN_TO_HOST_INT64(generation); }
+            return B_LENDIAN_TO_HOST_INT64(generation); }
     uint64 Root() const {
-        return B_LENDIAN_TO_HOST_INT64(root); }
+            return B_LENDIAN_TO_HOST_INT64(root); }
     uint64 ChunkRoot() const {
-        return B_LENDIAN_TO_HOST_INT64(chunk_root); }
+            return B_LENDIAN_TO_HOST_INT64(chunk_root); }
     uint64 LogRoot() const {
-        return B_LENDIAN_TO_HOST_INT64(log_root); }
+            return B_LENDIAN_TO_HOST_INT64(log_root); }
     uint8 ChunkRootLevel() const { return chunk_root_level; }
 } _PACKED;
 
+
 struct btrfs_inode {
     uint64  generation;
     uint64  transaction_id;
@@ -212 +223 @@
     uint32 Mode() const { return B_LENDIAN_TO_HOST_INT32(mode); }
     uint64 Flags() const { return B_LENDIAN_TO_HOST_INT64(flags); }
     uint64 Sequence() const { return B_LENDIAN_TO_HOST_INT64(sequence); }
-    static void _DecodeTime(struct timespec &timespec,
-        const struct btrfs_timespec &time)
+    static void _DecodeTime(struct timespec& timespec,
+        const struct btrfs_timespec& time)
     {
         timespec.tv_sec = B_LENDIAN_TO_HOST_INT64(time.seconds);
         timespec.tv_nsec = B_LENDIAN_TO_HOST_INT32(time.nanoseconds);
     }
-    void GetAccessTime(struct timespec &timespec) const 
-        { _DecodeTime(timespec, access_time); }
-    void GetChangeTime(struct timespec &timespec) const 
-        { _DecodeTime(timespec, change_time); }
-    void GetModificationTime(struct timespec &timespec) const 
-        { _DecodeTime(timespec, modification_time); }
-    void GetCreationTime(struct timespec &timespec) const 
-        { _DecodeTime(timespec, creation_time); }
+    void GetAccessTime(struct timespec& timespec) const 
+            { _DecodeTime(timespec, access_time); }
+    void GetChangeTime(struct timespec& timespec) const 
+            { _DecodeTime(timespec, change_time); }
+    void GetModificationTime(struct timespec& timespec) const 
+            { _DecodeTime(timespec, modification_time); }
+    void GetCreationTime(struct timespec& timespec) const 
+            { _DecodeTime(timespec, creation_time); }
 } _PACKED;
 
+
 struct btrfs_root {
     btrfs_inode inode;
     uint64  generation;
@@ -242 +254 @@
     uint8   drop_level;
     uint8   level;
     uint64 Generation() const {
-        return B_LENDIAN_TO_HOST_INT64(generation); }
+            return B_LENDIAN_TO_HOST_INT64(generation); }
     uint64 BlockNum() const { return B_LENDIAN_TO_HOST_INT64(blocknum); }
 } _PACKED;
 
+
 struct btrfs_dir_entry {
     btrfs_key location;
     uint64  transaction_id;
@@ -256 +269 @@
     uint16 NameLength() const { return B_LENDIAN_TO_HOST_INT16(name_length); }
     ino_t InodeID() const { return location.ObjectID(); }
     uint16 Length() const
-        { return sizeof(*this) + NameLength() + DataLength(); }
+            { return sizeof(*this) + NameLength() + DataLength(); }
 } _PACKED;
 
+
 struct btrfs_extent_data {
     uint64  generation;
     uint64  memory_size;
@@ -276 +290 @@
         uint8 inline_data[0];
     };
     uint64 Generation() const {
-        return B_LENDIAN_TO_HOST_INT64(generation); }
+            return B_LENDIAN_TO_HOST_INT64(generation); }
     uint64 MemoryBytes() const {
-        return B_LENDIAN_TO_HOST_INT64(memory_size); }
+            return B_LENDIAN_TO_HOST_INT64(memory_size); }
     uint8 Compression() const { return compression; }
     uint8 Type() const { return type; }
     uint64 DiskOffset() const {
-        return B_LENDIAN_TO_HOST_INT64(disk_offset); }
+            return B_LENDIAN_TO_HOST_INT64(disk_offset); }
     uint64 DiskSize() const {
-        return B_LENDIAN_TO_HOST_INT64(disk_size); }
+            return B_LENDIAN_TO_HOST_INT64(disk_size); }
     uint64 ExtentOffset() const {
-        return B_LENDIAN_TO_HOST_INT64(extent_offset); }
+            return B_LENDIAN_TO_HOST_INT64(extent_offset); }
     uint64 Size() const {
-        return B_LENDIAN_TO_HOST_INT64(size); }
+            return B_LENDIAN_TO_HOST_INT64(size); }
 } _PACKED;
 
 

src/add-ons/kernel/file_systems/btrfs/crc_table.cpp

@@ -7 +7 @@
 
 /*! \file crc_table.cpp
 
-        Standalone program to generate the CRC table used for calculating
-        UDF tag id CRC values.
-       
-        This code based off of crc code in UDF-2.50 specs, as permitted.
-        See UDF-2.50 6.5 for more information. 
+    Standalone program to generate the CRC table used for calculating
+    UDF tag id CRC values.
 
-        Reflected version by Jéme Duval
+    This code based off of crc code in UDF-2.50 specs, as permitted.
+    See UDF-2.50 6.5 for more information. 
+
+    Reflected version by Jéme Duval
 */
 
-#include <stdio.h>
-#include <sys/types.h>
+
+#ifndef FS_SHELL
+#   include <stdio.h>
+#   include <sys/types.h>
+#else
+#   include "fssh_api_wrapper.h"
+#endif
 
 typedef unsigned int uint32 ;
 
@@ -36 +41 @@
 
 
 int
-main(int argc, char *argv[]) {
-        uint32 crc, poly;
+main(int argc, char* argv[]) {
+    uint32 crc, poly;
 
-        if (argc != 2) {
-                fprintf(stderr, "USAGE: crc_table <octal polynomial=3667067501 for btrfs>\n");
-                return 0;
-        }
+    if (argc != 2) {
+        fprintf(stderr, "USAGE: crc_table <octal polynomial=3667067501 for btrfs>\n");
+        return 0;
+    }
 
-        sscanf(argv[1], "%lo", &poly);
-       
-        printf("//! CRC 0%o table, as generated by crc_table.cpp\n", poly);
-        printf("static uint32 crc_table[256] = { \n");
-        for (int n = 0; n < 256; n++) {
-                if (n%8 == 0)
-                        printf("    ");
-                crc = reflect32(n);
-                for (int i = 0; i < 8; i++) {
-                        if (crc & 0x80000000)
-                                crc = (crc << 1) ^ poly;
-                        else
-                                crc <<= 1;
-                }
+    sscanf(argv[1], "%lo", &poly);
+   
+    printf("//! CRC 0%o table, as generated by crc_table.cpp\n", poly);
+    printf("static uint32 crc_table[256] = { \n");
+    for (int n = 0; n < 256; n++) {
+        if (n % 8 == 0)
+            printf("    ");
+        crc = reflect32(n);
+        for (int i = 0; i < 8; i++) {
+            if (crc & 0x80000000)
+                crc = (crc << 1) ^ poly;
+            else
+                crc <<= 1;
+        }
         crc = reflect32(crc);
-                printf("0x%08x%s ", crc, (n != 255 ? "," : ""));
-                if (n%8 == 7)
-                        printf("\n");
-        }
-        printf("};\n");
-        return 0;
+        printf("0x%08x%s ", crc, (n != 255 ? "," : ""));
+        if (n % 8 == 7)
+            printf("\n");
+    }
+    printf("};\n");
+    return 0;
 }

src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp

@@ -5 +5 @@
  */
 
 
-#include <dirent.h>
-#include <util/kernel_cpp.h>
-#include <string.h>
-
-#include <AutoDeleter.h>
-#include <fs_cache.h>
-#include <fs_info.h>
-#include <io_requests.h>
-#include <NodeMonitor.h>
-#include <util/AutoLock.h>
+#ifndef FS_SHELL
+#   include <dirent.h>
+#   include <util/kernel_cpp.h>
+#   include <string.h>
+#   include <AutoDeleter.h>
+#   include <fs_cache.h>
+#   include <fs_info.h>
+#   include <io_requests.h>
+#   include <NodeMonitor.h>
+#   include <util/AutoLock.h>
+#else
+#   include "fssh_api_wrapper.h"
+#   include "fssh_auto_deleter.h"
+#endif
 
 #include "Attribute.h"
 #include "AttributeIterator.h"
@@ -68 +72 @@
 
 
 static float
-btrfs_identify_partition(int fd, partition_data *partition, void **_cookie)
+btrfs_identify_partition(int fd, partition_data* partition, void** _cookie)
 {
     btrfs_super_block superBlock;
     status_t status = Volume::Identify(fd, &superBlock);
     if (status != B_OK)
         return -1;
 
-    identify_cookie *cookie = new identify_cookie;
+    identify_cookie* cookie = new identify_cookie;
     memcpy(&cookie->super_block, &superBlock, sizeof(btrfs_super_block));
 
     *_cookie = cookie;
@@ -84 +88 @@
 
 
 static status_t
-btrfs_scan_partition(int fd, partition_data *partition, void *_cookie)
+btrfs_scan_partition(int fd, partition_data* partition, void* _cookie)
 {
-    identify_cookie *cookie = (identify_cookie *)_cookie;
+    identify_cookie* cookie = (identify_cookie*)_cookie;
 
     partition->status = B_PARTITION_VALID;
     partition->flags |= B_PARTITION_FILE_SYSTEM;
@@ -138 +142 @@
 
 
 static status_t
-btrfs_unmount(fs_volume *_volume)
+btrfs_unmount(fs_volume* _volume)
 {
-    Volume* volume = (Volume *)_volume->private_volume;
+    Volume* volume = (Volume*)_volume->private_volume;
 
     status_t status = volume->Unmount();
     delete volume;
@@ -452 +456 @@
 
 
 static status_t
-btrfs_close(fs_volume *_volume, fs_vnode *_node, void *_cookie)
+btrfs_close(fs_volume* _volume, fs_vnode* _node, void* _cookie)
 {
     return B_OK;
 }
@@ -482 +486 @@
 
 
 static status_t
-btrfs_read_link(fs_volume *_volume, fs_vnode *_node, char *buffer,
-    size_t *_bufferSize)
+btrfs_read_link(fs_volume* _volume, fs_vnode* _node, char* buffer,
+    size_t* _bufferSize)
 {
     Inode* inode = (Inode*)_node->private_node;
     return inode->ReadAt(0, (uint8*)buffer, _bufferSize);
@@ -516 +520 @@
 
 
 static status_t
-btrfs_read_dir(fs_volume *_volume, fs_vnode *_node, void *_cookie,
-    struct dirent *dirent, size_t bufferSize, uint32 *_num)
+btrfs_read_dir(fs_volume* _volume, fs_vnode* _node, void* _cookie,
+    struct dirent* dirent, size_t bufferSize, uint32* _num)
 {
     DirectoryIterator* iterator = (DirectoryIterator*)_cookie;
     Volume* volume = (Volume*)_volume->private_volume;
@@ -560 +564 @@
 
 
 static status_t
-btrfs_rewind_dir(fs_volume * /*_volume*/, fs_vnode * /*node*/, void *_cookie)
+btrfs_rewind_dir(fs_volume* /*_volume*/, fs_vnode* /*node*/, void* _cookie)
 {
     DirectoryIterator* iterator = (DirectoryIterator*)_cookie;
 
@@ -576 +580 @@
 
 
 static status_t
-btrfs_free_dir_cookie(fs_volume *_volume, fs_vnode *_node, void *_cookie)
+btrfs_free_dir_cookie(fs_volume* _volume, fs_vnode* _node, void* _cookie)
 {
     delete (DirectoryIterator*)_cookie;
     return B_OK;
@@ -584 +588 @@
 
 
 static status_t
-btrfs_open_attr_dir(fs_volume *_volume, fs_vnode *_node, void **_cookie)
+btrfs_open_attr_dir(fs_volume* _volume, fs_vnode* _node, void** _cookie)
 {
     Inode* inode = (Inode*)_node->private_node;
     TRACE("%s()\n", __FUNCTION__);
@@ -859 +863 @@
 };
 
 
-module_info *modules[] = {
-    (module_info *)&sBtrfsFileSystem,
+module_info* modules[] = {
+    (module_info*)&sBtrfsFileSystem,
     NULL,
 };