NTFS 2.0.7 release: pure cleanups.

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index a9417af498aa29a072cc7e865428cdf4d6e89250..ba8f1bb1d5e13f691579d75563d0b17b055e4b36 100644 (file)
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -28,6 +28,10 @@ ToDo:
 
        - Remove much of the NULL struct element initializers.
        - Various updates to make compatible with recent kernels.
+       - Remove defines of MAX_BUF_PER_PAGE and include linux/buffer_head.h
+         in fs/ntfs/ntfs.h instead.
+       - Remove no longer needed KERNEL_VERSION checks. We are now in the
+         kernel proper so they are no longer needed.
 
 2.0.6 - Major bugfix to make compatible with other kernel changes.
 

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index c35d74b0c4ceb4c60fb7f328457fab5d5b750362..21e2c0095bd21909be261d7663bfd6d7f327f60d 100644 (file)
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -29,12 +29,6 @@
 
 #include "ntfs.h"
 
-#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,8)
-#define page_buffers(page)     (page)->buffers
-#endif
-
 /**
  * end_buffer_read_file_async -
  *

diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index f5e8cf8be3e3accf1e3ef493a7431a2d641ddb6a..f5ff98b3c1ad5ee6761851bfd92259b12470be70 100644 (file)
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -25,8 +25,6 @@
 
 #include "ntfs.h"
 
-#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)
-
 /**
  * __format_mft_record - initialize an empty mft record
  * @m:         mapped, pinned and locked for writing mft record

diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h
index d3a4c9d9f87b99d2a6f30b993160f1cece830e9e..793ea711e1f2e74537969889c5748bb4ca062d57 100644 (file)
--- a/fs/ntfs/ntfs.h
+++ b/fs/ntfs/ntfs.h
@@ -26,14 +26,11 @@
 
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,5)
-#      error The NTFS driver requires at least kernel 2.5.5.
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/compiler.h>
 #include <linux/fs.h>
+#include <linux/buffer_head.h>
 #include <linux/nls.h>
 #include <linux/pagemap.h>
 #include <linux/smp.h>
@@ -49,10 +46,6 @@
 #include "attrib.h"
 #include "mft.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-typedef long sector_t;
-#endif
-
 typedef enum {
        NTFS_BLOCK_SIZE         = 512,
        NTFS_BLOCK_SIZE_BITS    = 9,