fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / ntfs / index.h

diff --git a/fs/ntfs/index.h b/fs/ntfs/index.h
index 8ed9436..8745469 100644 (file)
--- a/fs/ntfs/index.h
+++ b/fs/ntfs/index.h
@@ -30,18 +30,19 @@
 #include "inode.h"
 #include "attrib.h"
 #include "mft.h"
+#include "aops.h"
 
 /**
  * @idx_ni:    index inode containing the @entry described by this context
  * @entry:     index entry (points into @ir or @ia)
  * @data:      index entry data (points into @entry)
  * @data_len:  length in bytes of @data
- * @is_in_root:        TRUE if @entry is in @ir and FALSE if it is in @ia
+ * @is_in_root:        'true' if @entry is in @ir and 'false' if it is in @ia
  * @ir:                index root if @is_in_root and NULL otherwise
  * @actx:      attribute search context if @is_in_root and NULL otherwise
  * @base_ni:   base inode if @is_in_root and NULL otherwise
- * @ia:                index block if @is_in_root is FALSE and NULL otherwise
- * @page:      page if @is_in_root is FALSE and NULL otherwise
+ * @ia:                index block if @is_in_root is 'false' and NULL otherwise
+ * @page:      page if @is_in_root is 'false' and NULL otherwise
  *
  * @idx_ni is the index inode this context belongs to.
  *
@@ -49,11 +50,11 @@
  * are the index entry data and its length in bytes, respectively.  @data
  * simply points into @entry.  This is probably what the user is interested in.
  *
- * If @is_in_root is TRUE, @entry is in the index root attribute @ir described
+ * If @is_in_root is 'true', @entry is in the index root attribute @ir described
  * by the attribute search context @actx and the base inode @base_ni.  @ia and
  * @page are NULL in this case.
  *
- * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia
+ * If @is_in_root is 'false', @entry is in the index allocation attribute and @ia
  * and @page point to the index allocation block and the mapped, locked page it
  * is in, respectively.  @ir, @actx and @base_ni are NULL in this case.
  *
@@ -76,9 +77,9 @@ typedef struct {
        INDEX_ENTRY *entry;
        void *data;
        u16 data_len;
-       BOOL is_in_root;
+       bool is_in_root;
        INDEX_ROOT *ir;
-       attr_search_context *actx;
+       ntfs_attr_search_ctx *actx;
        ntfs_inode *base_ni;
        INDEX_ALLOCATION *ia;
        struct page *page;
@@ -115,8 +116,6 @@ static inline void ntfs_index_entry_flush_dcache_page(ntfs_index_context *ictx)
                flush_dcache_page(ictx->page);
 }
 
-extern void __ntfs_index_entry_mark_dirty(ntfs_index_context *ictx);
-
 /**
  * ntfs_index_entry_mark_dirty - mark an index entry dirty
  * @ictx:      ntfs index context describing the index entry
@@ -140,7 +139,8 @@ static inline void ntfs_index_entry_mark_dirty(ntfs_index_context *ictx)
        if (ictx->is_in_root)
                mark_mft_record_dirty(ictx->actx->ntfs_ino);
        else
-               __ntfs_index_entry_mark_dirty(ictx);
+               mark_ntfs_record_dirty(ictx->page,
+                               (u8*)ictx->ia - (u8*)page_address(ictx->page));
 }
 
 #endif /* NTFS_RW */