NTFS: Move the static inline ntfs_init_big_inode() from fs/ntfs/inode.c to

      inode.h and make fs/ntfs/inode.c::__ntfs_init_inode() non-static and
      add a declaration for it to inode.h.  Fix some compilation issues
      that resulted due to #includes and header file interdependencies.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 698b00b0d9d84683a430523fbbb16a7cc26808f1..abb6cfc41344141dfb4f39bc8633887d838ad8cd 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -128,6 +128,10 @@ ToDo/Notes:
          dirty state.  We cannot look at the dirty state for subsequent
          buffers because we might be racing with
          fs/ntfs/aops.c::mark_ntfs_record_dirty().
+       - Move the static inline ntfs_init_big_inode() from fs/ntfs/inode.c to
+         inode.h and make fs/ntfs/inode.c::__ntfs_init_inode() non-static and
+         add a declaration for it to inode.h.  Fix some compilation issues
+         that resulted due to #includes and header file interdependencies.
 
 2.1.20 - Fix two stupid bugs introduced in 2.1.18 release.
 

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 751c6d81de7a425a3fa2229a9b0a1a22b2cdd96d..101929b277a2d4752b502110cbdb112738353eb0 100644 (file)
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -29,9 +29,11 @@
 #include <linux/writeback.h>
 
 #include "aops.h"
+#include "attrib.h"
 #include "debug.h"
 #include "inode.h"
 #include "mft.h"
+#include "runlist.h"
 #include "types.h"
 #include "ntfs.h"
 

diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index b96fe5ff68dd1933515de48294b1147e5a8b8b21..5d173da9b6450503bdc872c08bbb1212913a6643 100644 (file)
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -25,6 +25,7 @@
 #include <linux/buffer_head.h>
 #include <linux/blkdev.h>
 
+#include "attrib.h"
 #include "inode.h"
 #include "debug.h"
 #include "ntfs.h"

diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h
index 63c62602224e31abc61ed4d7f9f4fa6d480ad8ba..8ac37c33d1278ef7d602e5dd3aa57de98e1d2236 100644 (file)
--- a/fs/ntfs/debug.h
+++ b/fs/ntfs/debug.h
@@ -22,13 +22,9 @@
 #ifndef _LINUX_NTFS_DEBUG_H
 #define _LINUX_NTFS_DEBUG_H
 
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/spinlock.h>
 #include <linux/fs.h>
 
-#include "inode.h"
-#include "attrib.h"
+#include "runlist.h"
 
 #ifdef DEBUG
 

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index e808649d5a8fed0c7740f9760ee8d54aa6b6e12f..2ec83edb68936fe3463e4dd8cf0f76ac207e58aa 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -22,6 +22,7 @@
 #include <linux/pagemap.h>
 #include <linux/buffer_head.h>
 
+#include "inode.h"
 #include "debug.h"
 #include "ntfs.h"
 

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index f15141fbbfe6c76c48e4b717a23ed2b640583d14..fc4a9615c202ec9f8572da837a600bda8f265829 100644 (file)
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -373,7 +373,7 @@ void ntfs_destroy_extent_inode(ntfs_inode *ni)
  *
  * Return zero on success and -ENOMEM on error.
  */
-static void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)
+void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)
 {
        ntfs_debug("Entering.");
        ni->initialized_size = ni->allocated_size = 0;
@@ -396,17 +396,6 @@ static void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)
        init_MUTEX(&ni->extent_lock);
        ni->nr_extents = 0;
        ni->ext.base_ntfs_ino = NULL;
-       return;
-}
-
-static inline void ntfs_init_big_inode(struct inode *vi)
-{
-       ntfs_inode *ni = NTFS_I(vi);
-
-       ntfs_debug("Entering.");
-       __ntfs_init_inode(vi->i_sb, ni);
-       ni->mft_no = vi->i_ino;
-       return;
 }
 
 inline ntfs_inode *ntfs_new_extent_inode(struct super_block *sb,

diff --git a/fs/ntfs/inode.h b/fs/ntfs/inode.h
index bf1d906d169130e6e2780f4d4960c1c584506936..eb54db217e8754041b994bcf9312cc4d81d23515 100644 (file)
--- a/fs/ntfs/inode.h
+++ b/fs/ntfs/inode.h
@@ -35,6 +35,7 @@
 #include "volume.h"
 #include "types.h"
 #include "runlist.h"
+#include "debug.h"
 
 typedef struct _ntfs_inode ntfs_inode;
 
@@ -276,6 +277,17 @@ extern struct inode *ntfs_alloc_big_inode(struct super_block *sb);
 extern void ntfs_destroy_big_inode(struct inode *inode);
 extern void ntfs_clear_big_inode(struct inode *vi);
 
+extern void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni);
+
+static inline void ntfs_init_big_inode(struct inode *vi)
+{
+       ntfs_inode *ni = NTFS_I(vi);
+
+       ntfs_debug("Entering.");
+       __ntfs_init_inode(vi->i_sb, ni);
+       ni->mft_no = vi->i_ino;
+}
+
 extern ntfs_inode *ntfs_new_extent_inode(struct super_block *sb,
                unsigned long mft_no);
 extern void ntfs_clear_extent_inode(ntfs_inode *ni);

diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c
index 9f20835e04a956c156f50e86bd44ca626ef6786f..5e280abafab3058f6479e02821e5e9a5832d8102 100644 (file)
--- a/fs/ntfs/logfile.c
+++ b/fs/ntfs/logfile.c
@@ -27,11 +27,12 @@
 #include <linux/buffer_head.h>
 #include <linux/bitops.h>
 
-#include "logfile.h"
-#include "volume.h"
+#include "attrib.h"
 #include "aops.h"
 #include "debug.h"
+#include "logfile.h"
 #include "malloc.h"
+#include "volume.h"
 #include "ntfs.h"
 
 /**

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 10c729286a8216dd6a0a762aa8cf555ab09fd05b..ea0bbedede2fbf82dce49fc5c421b1c3dbcda6f7 100644 (file)
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -23,12 +23,14 @@
 #include <linux/buffer_head.h>
 #include <linux/swap.h>
 
-#include "bitmap.h"
-#include "lcnalloc.h"
+#include "attrib.h"
 #include "aops.h"
+#include "bitmap.h"
 #include "debug.h"
-#include "mft.h"
+#include "dir.h"
+#include "lcnalloc.h"
 #include "malloc.h"
+#include "mft.h"
 #include "ntfs.h"
 
 /**

diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
index b47084f0607bbddfa894b224405ec0be4db9e97e..ac5997bec5cd9e50ff6a6a1ea43fed63cd9cd80d 100644 (file)
--- a/fs/ntfs/namei.c
+++ b/fs/ntfs/namei.c
@@ -23,8 +23,9 @@
 #include <linux/dcache.h>
 #include <linux/security.h>
 
-#include "dir.h"
+#include "attrib.h"
 #include "debug.h"
+#include "dir.h"
 #include "mft.h"
 #include "ntfs.h"
 

diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
index 6b9ca6883581c5012736ea0b9f62d7a9230286f5..50bfb6b5b3e09190370692af162e35a76c77668b 100644 (file)
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -20,8 +20,9 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "dir.h"
 #include "debug.h"
+#include "dir.h"
+#include "endian.h"
 #include "malloc.h"
 #include "ntfs.h"