Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[net-next-2.6.git] / fs / freevxfs / vxfs_dir.h

diff --git a/fs/freevxfs/vxfs_dir.h b/fs/freevxfs/vxfs_dir.h
index 8a4dfef1ddad7720a38343ec21ee695cd8584a09..aaf1fb098639553fc6ad7a8d6c9e0ccd7162a9ce 100644 (file)
--- a/fs/freevxfs/vxfs_dir.h
+++ b/fs/freevxfs/vxfs_dir.h
@@ -41,7 +41,7 @@
  * VxFS directory block header.
  *
  * This entry is the head of every filesystem block in a directory.
- * It is used for free space managment and additionally includes
+ * It is used for free space management and additionally includes
  * a hash for speeding up directory search (lookup).
  *
  * The hash may be empty and in fact we do not use it all in the
@@ -80,7 +80,7 @@ struct vxfs_direct {
  *     a d_name with size len.
  */
 #define VXFS_DIRPAD            4
-#define VXFS_NAMEMIN           ((int)((struct vxfs_direct *)0)->d_name)
+#define VXFS_NAMEMIN           offsetof(struct vxfs_direct, d_name)
 #define VXFS_DIRROUND(len)     ((VXFS_DIRPAD + (len) - 1) & ~(VXFS_DIRPAD -1))
 #define VXFS_DIRLEN(len)       (VXFS_DIRROUND(VXFS_NAMEMIN + (len)))