From 714cd1406a0a318b1c04cf47ab4b24251f7a992a Mon Sep 17 00:00:00 2001 From: Anton Altaparmakov Date: Sat, 16 Oct 2004 01:41:53 +0100 Subject: [PATCH] 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 --- fs/ntfs/ChangeLog | 4 ++++ fs/ntfs/aops.c | 2 ++ fs/ntfs/compress.c | 1 + fs/ntfs/debug.h | 6 +----- fs/ntfs/file.c | 1 + fs/ntfs/inode.c | 13 +------------ fs/ntfs/inode.h | 12 ++++++++++++ fs/ntfs/logfile.c | 5 +++-- fs/ntfs/mft.c | 8 +++++--- fs/ntfs/namei.c | 3 ++- fs/ntfs/runlist.c | 3 ++- 11 files changed, 34 insertions(+), 24 deletions(-) diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog index 698b00b0d9d84..abb6cfc413441 100644 --- 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 751c6d81de7a4..101929b277a2d 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -29,9 +29,11 @@ #include #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 b96fe5ff68dd1..5d173da9b6450 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c @@ -25,6 +25,7 @@ #include #include +#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 63c62602224e3..8ac37c33d1278 100644 --- 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 -#include -#include #include -#include "inode.h" -#include "attrib.h" +#include "runlist.h" #ifdef DEBUG diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index e808649d5a8fe..2ec83edb68936 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -22,6 +22,7 @@ #include #include +#include "inode.h" #include "debug.h" #include "ntfs.h" diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index f15141fbbfe6c..fc4a9615c202e 100644 --- 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 bf1d906d16913..eb54db217e875 100644 --- 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 9f20835e04a95..5e280abafab30 100644 --- a/fs/ntfs/logfile.c +++ b/fs/ntfs/logfile.c @@ -27,11 +27,12 @@ #include #include -#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 10c729286a821..ea0bbedede2fb 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -23,12 +23,14 @@ #include #include -#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 b47084f0607bb..ac5997bec5cd9 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c @@ -23,8 +23,9 @@ #include #include -#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 6b9ca6883581c..50bfb6b5b3e09 100644 --- 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" -- 2.53.0