ocfs2: De-magic the in-memory slot map.

The in-memory slot map uses the same magic as the on-disk one.  There is
a special value to mark a slot as invalid.  It relies on the size of
certain types and so on.

Write a new in-memory map that keeps validity as a separate field.  Outside
of the I/O functions, OCFS2_INVALID_SLOT now means what it is supposed to.
It also is no longer tied to the type size.

This also means that only the I/O functions refer to 16bit quantities.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index c6ed8c35de0d..95f783dbe8b2 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -216,10 +216,10 @@ struct ocfs2_super
         unsigned long s_mount_opt;
         unsigned int s_atime_quantum;
 
-        u16 max_slots;
+        unsigned int max_slots;
         s16 node_num;
-        s16 slot_num;
-        s16 preferred_slot;
+        int slot_num;
+        int preferred_slot;
         int s_sectsize_bits;
         int s_clustersize;
         int s_clustersize_bits;