You can subscribe to this list here.
| 2001 |
Jan
(38) |
Feb
(25) |
Mar
(37) |
Apr
(50) |
May
|
Jun
(156) |
Jul
(174) |
Aug
(94) |
Sep
(107) |
Oct
(18) |
Nov
(153) |
Dec
(91) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(79) |
Feb
(117) |
Mar
(39) |
Apr
(164) |
May
(12) |
Jun
(64) |
Jul
(138) |
Aug
(43) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(17) |
Jun
(100) |
Jul
(210) |
Aug
(127) |
Sep
(89) |
Oct
(214) |
Nov
(176) |
Dec
(20) |
| 2006 |
Jan
(29) |
Feb
(85) |
Mar
(45) |
Apr
(54) |
May
(9) |
Jun
(7) |
Jul
(28) |
Aug
(65) |
Sep
(3) |
Oct
(62) |
Nov
(68) |
Dec
(52) |
| 2007 |
Jan
(6) |
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Anton A. <an...@us...> - 2002-03-05 00:22:26
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs In directory usw-pr-cvs1:/tmp/cvs-serv21518/linux/fs/ntfs Modified Files: ntfs.h super.c types.h Log Message: Update to latest kernel (2.5.6-pre2) Index: ntfs.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v retrieving revision 1.31 retrieving revision 1.32 diff -U2 -r1.31 -r1.32 --- ntfs.h 4 Mar 2002 22:56:14 -0000 1.31 +++ ntfs.h 5 Mar 2002 00:22:24 -0000 1.32 @@ -27,6 +27,6 @@ #include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3) -# error The NTFS driver requires at least kernel 2.5.3-pre3. +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,5) +# error The NTFS driver requires at least kernel 2.5.5. #endif @@ -40,8 +40,8 @@ #include <asm/atomic.h> +#include "types.h" #include "debug.h" #include "malloc.h" #include "endian.h" -#include "types.h" #include "volume.h" #include "inode.h" Index: super.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v retrieving revision 1.79 retrieving revision 1.80 diff -U2 -r1.79 -r1.80 --- super.c 4 Mar 2002 22:56:15 -0000 1.79 +++ super.c 5 Mar 2002 00:22:24 -0000 1.80 @@ -1500,6 +1500,6 @@ vol->mftbmp_mapping.a_ops = NULL; vol->mftbmp_mapping.host = NULL; - vol->mftbmp_mapping.i_mmap = NULL; - vol->mftbmp_mapping.i_mmap_shared = NULL; + INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap); + INIT_LIST_HEAD(&vol->mftbmp_mapping.i_mmap_shared); spin_lock_init(&vol->mftbmp_mapping.i_shared_lock); INIT_RUN_LIST(&vol->mftbmp_rl); Index: types.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/types.h,v retrieving revision 1.4 retrieving revision 1.5 diff -U2 -r1.4 -r1.5 --- types.h 4 Mar 2002 22:56:15 -0000 1.4 +++ types.h 5 Mar 2002 00:22:24 -0000 1.5 @@ -24,4 +24,12 @@ #define _LINUX_NTFS_TYPES_H +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) +#define SN(X) X /* Struct Name */ +#define SC(P,N) P.N /* ShortCut: Prefix, Name */ +#else +#define SN(X) +#define SC(P,N) N +#endif + /* 2-byte Unicode character type. */ typedef u16 uchar_t; |
|
From: Anton A. <an...@us...> - 2002-03-05 00:06:08
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfs-driver-tng In directory usw-pr-cvs1:/tmp/cvs-serv16719 Modified Files: Makefile Log Message: . Index: Makefile =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -U2 -r1.32 -r1.33 --- Makefile 5 Mar 2002 00:00:04 -0000 1.32 +++ Makefile 5 Mar 2002 00:06:05 -0000 1.33 @@ -9,5 +9,5 @@ # Modify this to point to your kernel sources. -KERNEL_SOURCE = /usr/src/linux-2.5.5-tng +KERNEL_SOURCE = /usr/src/l25 # Enable Module Versions? (yes/no) |
|
From: Richard R. <fl...@us...> - 2002-03-05 00:00:10
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv14916/linux/fs/ntfs
Modified Files:
inode.c
Log Message:
typo
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -U2 -r1.71 -r1.72
--- inode.c 4 Mar 2002 23:48:05 -0000 1.71
+++ inode.c 5 Mar 2002 00:00:04 -0000 1.72
@@ -559,5 +559,5 @@
goto put_unm_err_out;
}
- if (ctx->attr->_ANR(lowest_vcn))
+ if (ctx->attr->_ANR(lowest_vcn)) {
ntfs_error(vi->i_sb, "First extent of "
"$INDEX_ALLOCATION attribute has non "
@@ -600,5 +600,5 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
- if (ctx->attr->_ANR(lowest_vcn))
+ if (ctx->attr->_ANR(lowest_vcn)) {
ntfs_error(vi->i_sb, "First extent of $BITMAP "
"attribute has non zero "
|
|
From: Richard R. <fl...@us...> - 2002-03-05 00:00:10
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfs-driver-tng In directory usw-pr-cvs1:/tmp/cvs-serv14916 Modified Files: Makefile Log Message: typo Index: Makefile =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/Makefile,v retrieving revision 1.31 retrieving revision 1.32 diff -U2 -r1.31 -r1.32 --- Makefile 3 Feb 2002 04:02:51 -0000 1.31 +++ Makefile 5 Mar 2002 00:00:04 -0000 1.32 @@ -9,5 +9,5 @@ # Modify this to point to your kernel sources. -KERNEL_SOURCE = /usr/src/linux-2.5.3-tng +KERNEL_SOURCE = /usr/src/linux-2.5.5-tng # Enable Module Versions? (yes/no) |
|
From: Anton A. <an...@us...> - 2002-03-04 23:48:07
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv11089/linux/fs/ntfs
Modified Files:
inode.c
Log Message:
mark inode as bad if first extent has lowest vcn != 0.
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -U2 -r1.70 -r1.71
--- inode.c 4 Mar 2002 22:56:14 -0000 1.70
+++ inode.c 4 Mar 2002 23:48:05 -0000 1.71
@@ -376,4 +376,11 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_AttrListNonResident;
+ if (ctx->attr->_ANR(lowest_vcn)) {
+ ntfs_error(vi->i_sb, "Attribute list has non "
+ "zero lowest_vcn. Inode is "
+ "corrupt. You should run "
+ "chkdsk.");
+ goto put_unm_err_out;
+ }
/*
* Setup the run list. No need for locking as we have
@@ -403,7 +410,8 @@
}
} else /* if (!ctx.attr->non_resident) */ {
- if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->_ARA(value_offset)) +
- le32_to_cpu(ctx->attr->_ARA(value_length)) >
+ if ((u8*)ctx->attr + le16_to_cpu(
+ ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(
+ ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(vi->i_sb, "Corrupt attribute list "
@@ -412,7 +420,8 @@
}
/* Now copy the attribute list. */
- memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->_ARA(value_offset)),
- le32_to_cpu(ctx->attr->_ARA(value_length)));
+ memcpy(ni->attr_list, (u8*)ctx->attr + le16_to_cpu(
+ ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(
+ ctx->attr->_ARA(value_length)));
}
}
@@ -485,7 +494,9 @@
}
ni->_IDM(index_block_size) = le32_to_cpu(ir->index_block_size);
- if (ni->_IDM(index_block_size) & (ni->_IDM(index_block_size) - 1)) {
+ if (ni->_IDM(index_block_size) &
+ (ni->_IDM(index_block_size) - 1)) {
ntfs_error(vi->i_sb, "Index block size (%u) is not a "
- "power of two.", ni->_IDM(index_block_size));
+ "power of two.",
+ ni->_IDM(index_block_size));
goto put_unm_err_out;
}
@@ -503,9 +514,11 @@
"NTFS_BLOCK_SIZE (%i) is not "
"supported. Sorry.",
- ni->_IDM(index_block_size), NTFS_BLOCK_SIZE);
+ ni->_IDM(index_block_size),
+ NTFS_BLOCK_SIZE);
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->_IDM(index_block_size_bits) = ffs(ni->_IDM(index_block_size)) - 1;
+ ni->_IDM(index_block_size_bits) =
+ ffs(ni->_IDM(index_block_size)) - 1;
/* Determine the size of a vcn in the directory index. */
if (vol->cluster_size <= ni->_IDM(index_block_size)) {
@@ -546,8 +559,16 @@
goto put_unm_err_out;
}
+ if (ctx->attr->_ANR(lowest_vcn))
+ ntfs_error(vi->i_sb, "First extent of "
+ "$INDEX_ALLOCATION attribute has non "
+ "zero lowest_vcn. Inode is corrupt. "
+ "You should run chkdsk.");
+ goto put_unm_err_out;
+ }
vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
ni->initialized_size = sle64_to_cpu(
ctx->attr->_ANR(initialized_size));
- ni->allocated_size = sle64_to_cpu(ctx->attr->_ANR(allocated_size));
+ ni->allocated_size = sle64_to_cpu(
+ ctx->attr->_ANR(allocated_size));
/*
* Setup the run list. No need for locking as we have exclusive
@@ -579,4 +600,11 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
+ if (ctx->attr->_ANR(lowest_vcn))
+ ntfs_error(vi->i_sb, "First extent of $BITMAP "
+ "attribute has non zero "
+ "lowest_vcn. Inode is corrupt. "
+ "You should run chkdsk.");
+ goto put_unm_err_out;
+ }
ni->_IDM(bmp_size) = sle64_to_cpu(
ctx->attr->_ANR(data_size));
@@ -589,6 +617,6 @@
* exclusive access to the inode at this time.
*/
- ni->_IDM(bmp_rl).rl = decompress_mapping_pairs(vol, ctx->attr,
- NULL);
+ ni->_IDM(bmp_rl).rl = decompress_mapping_pairs(vol,
+ ctx->attr, NULL);
if (IS_ERR(ni->_IDM(bmp_rl).rl)) {
err = PTR_ERR(ni->_IDM(bmp_rl).rl);
@@ -602,5 +630,6 @@
ni->_IDM(bmp_size) = ni->_IDM(bmp_initialized_size) =
ni->_IDM(bmp_allocated_size) =
- le32_to_cpu(ctx->attr->_ARA(value_length));
+ le32_to_cpu(
+ ctx->attr->_ARA(value_length));
/* Consistency check bitmap size vs. index allocation size. */
if (ni->_IDM(bmp_size) << 3 < vi->i_size >>
@@ -677,5 +706,5 @@
}
ni->_ICF(compression_block_clusters) = 1U <<
- ctx->attr->_ANR(compression_unit);
+ ctx->attr->_ANR(compression_unit);
if (ctx->attr->_ANR(compression_unit) != 4) {
ntfs_error(vi->i_sb, "Found "
@@ -685,11 +714,11 @@
"indicate corruption so you "
"should run chkdsk.",
- ctx->attr->_ANR(compression_unit));
+ ctx->attr->_ANR(compression_unit));
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->_ICF(compression_block_size) = 1U <<
- (ctx->attr->_ANR(compression_unit) +
- vol->cluster_size_bits);
+ ni->_ICF(compression_block_size) = 1U << (
+ ctx->attr->_ANR(compression_unit)
+ + vol->cluster_size_bits);
ni->_ICF(compression_block_size_bits) = ffs(
ni->_ICF(compression_block_size)) - 1;
@@ -703,4 +732,11 @@
ni->state |= 1 << NI_Encrypted;
}
+ if (ctx->attr->_ANR(lowest_vcn)) {
+ ntfs_error(vi->i_sb, "First extent of $DATA "
+ "attribute has non zero "
+ "lowest_vcn. Inode is corrupt. "
+ "You should run chkdsk.");
+ goto put_unm_err_out;
+ }
/* $MFT is special as we have the run_list already. */
if (likely(vi->i_ino != FILE_MFT)) {
@@ -730,5 +766,5 @@
if (NInoCompressed(ni))
ni->_ICF(compressed_size) = sle64_to_cpu(
- ctx->attr->_ANR(compressed_size));
+ ctx->attr->_ANR(compressed_size));
} else { /* Resident attribute. */
/*
@@ -739,5 +775,5 @@
*/
vi->i_size = ni->initialized_size = ni->allocated_size =
- le32_to_cpu(ctx->attr->_ARA(value_length));
+ le32_to_cpu(ctx->attr->_ARA(value_length));
}
no_data_attr_special_case:
@@ -929,4 +965,10 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_AttrListNonResident;
+ if (ctx->attr->_ANR(lowest_vcn)) {
+ ntfs_error(sb, "Attribute list has non zero "
+ "lowest_vcn. $MFT is corrupt. "
+ "You should run chkdsk.");
+ goto put_err_out;
+ }
/* Setup the run list. */
ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
@@ -949,7 +991,8 @@
}
} else /* if (!ctx.attr->non_resident) */ {
- if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->_ARA(value_offset)) +
- le32_to_cpu(ctx->attr->_ARA(value_length)) >
+ if ((u8*)ctx->attr + le16_to_cpu(
+ ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(
+ ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(sb, "Corrupt attribute list "
@@ -958,7 +1001,8 @@
}
/* Now copy the attribute list. */
- memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->_ARA(value_offset)),
- le32_to_cpu(ctx->attr->_ARA(value_length)));
+ memcpy(ni->attr_list, (u8*)ctx->attr + le16_to_cpu(
+ ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(
+ ctx->attr->_ARA(value_length)));
}
/* The attribute list is now setup in memory. */
@@ -1065,4 +1109,11 @@
/* Are we in the first extent? */
if (!next_vcn) {
+ if (attr->_ANR(lowest_vcn)) {
+ ntfs_error(sb, "First extent of $DATA "
+ "attribute has non zero "
+ "lowest_vcn. $MFT is corrupt. "
+ "You should run chkdsk.");
+ goto put_err_out;
+ }
/* Get the last vcn in the $DATA attribute. */
last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
@@ -1070,8 +1121,8 @@
/* Fill in the inode size. */
vi->i_size = sle64_to_cpu(attr->_ANR(data_size));
- ni->initialized_size =
- sle64_to_cpu(attr->_ANR(initialized_size));
- ni->allocated_size =
- sle64_to_cpu(attr->_ANR(allocated_size));
+ ni->initialized_size = sle64_to_cpu(
+ attr->_ANR(initialized_size));
+ ni->allocated_size = sle64_to_cpu(
+ attr->_ANR(allocated_size));
/* Set the number of mft records. */
vol->_VMM(nr_mft_records) = vi->i_size >>
|
|
From: Anton A. <an...@us...> - 2002-03-04 23:48:07
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfs-driver-tng In directory usw-pr-cvs1:/tmp/cvs-serv11089 Modified Files: ChangeLog Log Message: mark inode as bad if first extent has lowest vcn != 0. Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -U2 -r1.70 -r1.71 --- ChangeLog 4 Mar 2002 19:29:19 -0000 1.70 +++ ChangeLog 4 Mar 2002 23:48:05 -0000 1.71 @@ -33,6 +33,4 @@ in between. Either need different type of optimization as above or need to change the read/write spinlock to a read/write semaphore. - - Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as - bad if found. tng-0.0.8 - Work in progress. @@ -108,4 +106,6 @@ support attribute lists. If it did happen it would imply the inode being corrupt. + - Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as + bad if found. tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only! |
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv25998
Modified Files:
aops.c attrib.c attrib.h compress.c dir.c inode.c mft.c ntfs.h
super.c types.h volume.h
Log Message:
merge the gcc-2.95 and Anton's changes into the trunk
Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -U2 -r1.54 -r1.55
--- aops.c 25 Feb 2002 04:00:58 -0000 1.54
+++ aops.c 4 Mar 2002 22:56:14 -0000 1.55
@@ -101,5 +101,7 @@
/* Convert the vcn to the corresponding logical cluster number (lcn). */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
/* Successful remap. */
if (lcn >= 0) {
@@ -296,5 +298,7 @@
return 0;
}
- lcn = vcn_to_lcn(vol->mftbmp_rl, vcn);
+ read_lock(&vol->mftbmp_rl.lock);
+ lcn = vcn_to_lcn(vol->mftbmp_rl.rl, vcn);
+ read_unlock(&vol->mftbmp_rl.lock);
ntfs_debug("lcn = 0x%Lx.", (long long)lcn);
if (lcn < 0LL) {
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -U2 -r1.67 -r1.68
--- attrib.c 25 Feb 2002 04:30:08 -0000 1.67
+++ attrib.c 4 Mar 2002 22:56:14 -0000 1.68
@@ -27,6 +27,8 @@
/**
* rl_mm - run_list memmove
+ *
+ * It is up to the caller to serialize access to the run list @base.
*/
-static inline void rl_mm (run_list *base, int dst, int src, int size)
+static inline void rl_mm(run_list_element *base, int dst, int src, int size)
{
if ((dst != src) && (size > 0))
@@ -36,7 +38,10 @@
/**
* rl_mc - run_list memory copy
+ *
+ * It is up to the caller to serialize access to the run lists @dstbase and
+ * @srcbase.
*/
-static inline void rl_mc (run_list *dstbase, int dst, run_list *srcbase,
- int src, int size)
+static inline void rl_mc(run_list_element *dstbase, int dst,
+ run_list_element *srcbase, int src, int size)
{
if (size > 0)
@@ -54,4 +59,6 @@
* memory, this function returns and entire page of memory.
*
+ * It is up to the caller to serialize access to the run list @orig.
+ *
* N.B. If the new allocation doesn't require a different number of pages in
* memory, the function will return the original pointer.
@@ -62,7 +69,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_realloc (run_list *orig, int old, int new)
+static inline run_list_element *ntfs_rl_realloc(run_list_element *orig,
+ int old, int new)
{
- run_list *nrl;
+ run_list_element *nrl;
old = PAGE_ALIGN (old * sizeof (run_list));
@@ -90,8 +98,10 @@
* must be adjacent.
*
+ * It is up to the caller to serialize access to the run lists @one and @two.
+ *
* Return: TRUE Success, the run_lists were merged
* FALSE Failure, the run_lists were not merged
*/
-static inline BOOL ntfs_rl_merge (run_list *one, run_list *two)
+static inline BOOL ntfs_rl_merge(run_list_element *one, run_list_element *two)
{
BUG_ON (!one || !two);
@@ -117,7 +127,9 @@
*
* Append a run_list after element @loc in @orig. Merge the right end of
- * the new run_list, if necesary. Adjust the size of the hole before the
+ * the new run_list, if necessary. Adjust the size of the hole before the
* appended run_list.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -125,13 +137,13 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_append (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_append(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL right;
BUG_ON (!orig || !new);
- /* First, merge the right hand end, if necesary. */
+ /* First, merge the right hand end, if necessary. */
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
@@ -164,7 +176,9 @@
*
* Insert a run_list before element @loc in @orig. Merge the left end of
- * the new run_list, if necesary. Adjust the size of the hole after the
+ * the new run_list, if necessary. Adjust the size of the hole after the
* inserted run_list.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -172,8 +186,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_insert (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_insert(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL left = FALSE;
BOOL disc = FALSE; /* Discontinuity */
@@ -253,5 +267,7 @@
*
* Replace the run_list at @loc with @new. Merge the left and right ends of
- * the inserted run_list, if necesary.
+ * the inserted run_list, if necessary.
+ *
+ * It is up to the caller to serialize access to the run lists @orig and @new.
*
* Return: Pointer, The new, combined, run_list
@@ -260,8 +276,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_replace (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_replace(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL left = FALSE;
BOOL right;
@@ -303,4 +319,6 @@
* run_lists is necessary. Adjust the size of the holes either side.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -308,8 +326,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_split (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_split(run_list_element *orig, int osize,
+ run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BUG_ON (!orig || !new);
@@ -341,4 +359,6 @@
* or completely within a hole in @drl.
*
+ * It is up to the caller to serialize access to the run lists @drl and @srl.
+ *
* Merging of run lists is necessary in two cases:
* 1. When attribute lists are used and a further extent is being mapped.
@@ -361,7 +381,7 @@
* -ERANGE, The run_lists overlap and cannot be merged.
*/
-run_list * merge_run_lists (run_list *drl, run_list *srl)
+run_list_element *merge_run_lists(run_list_element *drl, run_list_element *srl)
{
- run_list *nrl; /* New run list. */
+ run_list_element *nrl; /* New run list. */
int di, si; /* Current index into @[ds]rl. */
int sstart; /* First index with lcn > LCN_RL_NOT_MAPPED. */
@@ -530,4 +550,6 @@
* longer valid.
*
+ * It is up to the caller to serialize access to the run list @old_rl.
+ *
* Check the return value for error with IS_ERR(ret_val). If this is FALSE,
* the function was successful, the return value is the new run list, and if
@@ -547,12 +569,12 @@
* run list if overlap present and return error).
*/
-run_list *decompress_mapping_pairs(const ntfs_volume *vol,
- const ATTR_RECORD *attr, run_list *old_rl)
+run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+ const ATTR_RECORD *attr, run_list_element *old_rl)
{
VCN vcn; /* Current vcn. */
LCN lcn; /* Current lcn. */
s64 deltaxcn; /* Change in [vl]cn. */
- run_list *rl = NULL; /* The output run_list. */
- run_list *rl2; /* Temporary run_list. */
+ run_list_element *rl = NULL; /* The output run_list. */
+ run_list_element *rl2; /* Temporary run_list. */
u8 *buf; /* Current position in mapping pairs array. */
u8 *attr_end; /* End of attribute. */
@@ -773,5 +795,4 @@
attr_search_context *ctx;
MFT_RECORD *mrec;
- run_list *rl;
const uchar_t *name;
u32 name_len;
@@ -810,7 +831,25 @@
}
- /* Decode the run list. */
- rl = decompress_mapping_pairs(ni->vol, ctx->attr, ni->run_list);
+ /* Lock the run list. */
+ write_lock(&ni->run_list.lock);
+ /* Make sure someone else didn't do the work while we were spinning. */
+ if (likely(vcn_to_lcn(ni->run_list.rl, vcn) <= LCN_RL_NOT_MAPPED)) {
+ run_list_element *rl;
+
+ /* Decode the run list. */
+ rl = decompress_mapping_pairs(ni->vol, ctx->attr,
+ ni->run_list.rl);
+
+ /* Flag any errors or set the run list if successful. */
+ if (unlikely(IS_ERR(rl)))
+ err = PTR_ERR(rl);
+ else
+ ni->run_list.rl = rl;
+ }
+
+ /* Unlock the run list. */
+ write_unlock(&ni->run_list.lock);
+
put_attr_search_ctx(ctx);
@@ -819,12 +858,6 @@
/* If an error occured, return it. */
- if (IS_ERR(rl))
- return PTR_ERR(rl);
-
- /* Everything ok, set the run list. */
- ni->run_list = rl;
-
ntfs_debug("Done.");
- return 0;
+ return err;
unm_err_out:
@@ -842,4 +875,6 @@
* corresponding lcns.
*
+ * It is up to the caller to serialize access to the run list @rl.
+ *
* Since lcns must be >= 0, we use negative return values with special meaning:
*
@@ -852,5 +887,5 @@
* -4 = LCN_EINVAL Input parameter error (if debug enabled).
*/
-LCN vcn_to_lcn(const run_list *rl, const VCN vcn)
+LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn)
{
int i;
@@ -1058,7 +1093,10 @@
* Note, @size does not need to be a multiple of the cluster size.
*
+ * It is up to the caller to serialize access to the run list @rl.
+ *
* Return 0 on success or -errno on error.
*/
-int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al, const s64 size)
+int load_attribute_list(ntfs_volume *vol, run_list_element *rl, u8 *al,
+ const s64 size)
{
LCN lcn;
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- attrib.h 25 Feb 2002 04:00:58 -0000 1.16
+++ attrib.h 4 Mar 2002 22:56:14 -0000 1.17
@@ -67,10 +67,10 @@
} attr_search_context;
-extern run_list *decompress_mapping_pairs(const ntfs_volume *vol,
- const ATTR_RECORD *attr, run_list *run_list);
+extern run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+ const ATTR_RECORD *attr, run_list_element *old_rl);
extern int map_run_list(ntfs_inode *ni, VCN vcn);
-extern LCN vcn_to_lcn(const run_list *rl, const VCN vcn);
+extern LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn);
extern BOOL find_attr(const ATTR_TYPES type, const uchar_t *name,
@@ -82,5 +82,5 @@
const u32 val_len, attr_search_context *ctx);
-extern int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al,
+extern int load_attribute_list(ntfs_volume *vol, run_list_element *rl, u8 *al,
const s64 size);
Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -U2 -r1.33 -r1.34
--- compress.c 25 Feb 2002 04:00:58 -0000 1.33
+++ compress.c 4 Mar 2002 22:56:14 -0000 1.34
@@ -119,4 +119,7 @@
* @cb_size: size of compression block @cb_start in bytes (IN)
*
+ * The caller must have disabled preemption. ntfs_decompress() reenables it when
+ * the critical section is finished.
+ *
* This decompresses the compression block @cb_start into the array of
* destination pages @dest_pages starting at index @dest_index into @dest_pages
@@ -136,6 +139,6 @@
* unpredicatbly! You have been warned!
*
- * Note: This function may not sleep until it has finished accessing the
- * compression block @cb_start.
+ * Note to hackers: This function may not sleep until it has finished accessing
+ * the compression block @cb_start as it is a per-CPU buffer.
*/
static int ntfs_decompress(struct page *dest_pages[], int *dest_index,
@@ -186,4 +189,6 @@
err = 0;
return_error:
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
/* Second stage: finalize completed pages. */
for (i = 0; i < nr_completed_pages; i++) {
@@ -565,5 +570,7 @@
}
/* Find lcn of vcn and convert it into blocks. */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
(long long)vcn, (long long)lcn);
@@ -624,8 +631,7 @@
* Get the compression buffer corresponding to the current CPU. We must
* not sleep any more until we are finished with the compression buffer.
- * If on a preemptible kernel, disable preemption.
+ * If on a preemptible kernel, now disable preemption.
*/
- // preempt_disable();
- // don't forget preempt_enable(); later!
+ preempt_disable();
cb = ntfs_compression_buffers[smp_processor_id()];
@@ -663,5 +669,6 @@
/* Sparse cb, zero out page range overlapping the cb. */
ntfs_debug("Found sparse compression block.");
- /* We can sleep from now on. */
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
if (cb_max_ofs)
cb_max_page--;
@@ -744,5 +751,7 @@
cur_ofs = cb_max_ofs;
}
- /* We can sleep from now on. Second stage: finalize pages. */
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
+ /* Second stage: finalize pages. */
for (; cur2_page < cb_max_page; cur2_page++) {
page = pages[cur2_page];
@@ -771,5 +780,8 @@
cb_max_page, cb_max_ofs, xpage, &xpage_done,
cb_pos, cb_size - (cb_pos - cb));
- /* We can sleep from now on. */
+ /*
+ * We can sleep from now on, preemption already reenabled by
+ * ntfs_decompess.
+ */
if (err) {
ntfs_error(vol->sb, "ntfs_decompress() failed with "
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -U2 -r1.47 -r1.48
--- dir.c 25 Feb 2002 04:00:58 -0000 1.47
+++ dir.c 4 Mar 2002 22:56:14 -0000 1.48
@@ -82,5 +82,5 @@
ctx)) {
ntfs_error(sb, "Index root attribute missing in directory "
- "inode %Li.",
+ "inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -189,6 +189,6 @@
if (!NInoIndexAllocPresent(dir_ni)) {
ntfs_error(sb, "No index allocation attribute but index entry "
- "requires one. Directory inode %Li is corrupt "
- "or driver bug.",
+ "requires one. Directory inode 0x%Lx is "
+ "corrupt or driver bug.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -219,5 +219,5 @@
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
- "inode %Li or driver bug.",
+ "inode 0x%Lx or driver bug.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -225,7 +225,8 @@
}
if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
- ntfs_error(sb, "Actual VCN (%Li) of index buffer is different "
- "from expected VCN (%Li). Directory inode %Li "
- "is corrupt or driver bug.",
+ ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+ "different from expected VCN (0x%Lx). "
+ "Directory inode 0x%Lx is corrupt or driver "
+ "bug.",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)vcn,
@@ -236,8 +237,8 @@
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
dir_ni->_IDM(index_block_size)) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "has a size (%u) differing from the directory "
- "specified size (%u). Directory inode is "
- "corrupt or driver bug.",
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx has a size (%u) differing from the "
+ "directory specified size (%u). Directory "
+ "inode is corrupt or driver bug.",
(long long)vcn,
(unsigned long long)dir_ni->mft_no,
@@ -249,7 +250,7 @@
index_end = (u8*)ia + dir_ni->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "crosses page boundary. Impossible! Cannot "
- "access! This is probably a bug in the "
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx crosses page boundary. Impossible! "
+ "Cannot access! This is probably a bug in the "
"driver.", (long long)vcn,
(unsigned long long)dir_ni->mft_no);
@@ -259,6 +260,6 @@
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + dir_ni->_IDM(index_block_size)) {
- ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
- "inode %Li exceeds maximum size.",
+ ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+ "inode 0x%Lx exceeds maximum size.",
(long long)vcn,
(unsigned long long)dir_ni->mft_no);
@@ -281,5 +282,5 @@
index_end) {
ntfs_error(sb, "Index entry out of bounds in "
- "directory inode %Li.",
+ "directory inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -366,5 +367,5 @@
if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
ntfs_error(sb, "Index entry with child node found in "
- "a leaf node in directory inode %Li.",
+ "a leaf node in directory inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -386,5 +387,5 @@
}
ntfs_error(sb, "Negative child node vcn in directory inode "
- "%Li.", (unsigned long long)dir_ni->mft_no);
+ "0x%Lx.", (unsigned long long)dir_ni->mft_no);
err = -EIO;
goto unm_unm_err_out;
@@ -420,9 +421,18 @@
} INDEX_TYPE;
-/*
+/**
+ * ntfs_filldir - ntfs specific filldir method
+ * @vol: current ntfs volume
+ * @filp: open file descriptor for the current directory
+ * @ndir: ntfs inode of current directory
+ * @index_type: specifies whether @iu is an index root or an index allocation
+ * @iu: index root or index allocation attribute to which @ie belongs
+ * @ie: current index entry
+ * @name: buffer to use for the converted name
+ * @dirent: vfs filldir callback context
+ * filldir: vfs filldir callback
+ *
* Convert the Unicode name to the loaded NLS and pass it to
* the filldir callback.
- *
- * If @is_ia is TRUE, iu is an INDEX_ALLOCATION. Otherwise it is an INDEX_ROOT.
*/
static inline int ntfs_filldir(ntfs_volume *vol, struct file *filp,
@@ -433,4 +443,6 @@
int name_len;
unsigned dt_type;
+ FILE_NAME_TYPE_FLAGS name_type;
+ READDIR_OPTIONS readdir_opts;
/* Advance the position even if going to skip the entry. */
@@ -442,12 +454,26 @@
else /* if (index_type == INDEX_TYPE_ROOT) */
filp->f_pos = (u8*)ie - (u8*)iu.ir;
- if (ie->key.file_name.file_name_type == FILE_NAME_DOS) {
- ntfs_debug("Skipping DOS only name space entry.");
+ readdir_opts = vol->readdir_opts;
+ name_type = ie->key.file_name.file_name_type;
+ if (name_type == FILE_NAME_DOS && RHideDosNames(readdir_opts)) {
+ ntfs_debug("Skipping DOS name space entry.");
return 0;
}
+ if (RHideLongNames(readdir_opts)) {
+ if (name_type == FILE_NAME_WIN32 ||
+ name_type == FILE_NAME_POSIX) {
+ ntfs_debug("Skipping WIN32/POSIX name space entry.");
+ return 0;
+ }
+ }
if (MREF_LE(ie->_IIF(indexed_file)) == FILE_root) {
ntfs_debug("Skipping root directory self reference entry.");
return 0;
}
+ if (MREF_LE(ie->_IIF(indexed_file)) < FILE_first_user &&
+ RHideSystemFiles(readdir_opts)) {
+ ntfs_debug("Skipping system file.");
+ return 0;
+ }
name_len = ntfs_ucstonls(vol, (uchar_t*)&ie->key.file_name.file_name,
ie->key.file_name.file_name_length, &name,
@@ -553,9 +579,9 @@
ctx)) {
ntfs_error(sb, "Index root attribute missing in directory "
- "inode %Li.", (unsigned long long)ndir->mft_no);
+ "inode 0x%Lx.",
+ (unsigned long long)ndir->mft_no);
err = -EIO;
goto kf_unm_err_out;
}
- /* FIXME: Clean up search context. */
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
@@ -613,5 +639,5 @@
ctx)) {
ntfs_error(sb, "Index bitmap attribute missing in "
- "directory inode %Li.",
+ "directory inode 0x%Lx.",
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -662,5 +688,5 @@
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
- "inode %Li or driver bug.",
+ "inode 0x%Lx or driver bug.",
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -670,8 +696,8 @@
~(s64)(ndir->_IDM(index_block_size) - 1)) >>
ndir->_IDM(index_vcn_size_bits)) {
- ntfs_error(sb, "Actual VCN (%Li) of index buffer is "
- "different from expected VCN (%Li). "
- "Directory inode %Li is corrupt or "
- "driver bug. ",
+ ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+ "different from expected VCN (0x%Lx). "
+ "Directory inode 0x%Lx is corrupt or driver "
+ "bug. ",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
@@ -682,9 +708,9 @@
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
ndir->_IDM(index_block_size)) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "has a size (%u) differing from the directory "
- "specified size (%u). Directory inode is "
- "corrupt or driver bug.", (long long)ia_pos >>
- ndir->_IDM(index_vcn_size_bits),
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx has a size (%u) differing from the "
+ "directory specified size (%u). Directory "
+ "inode is corrupt or driver bug.",
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
@@ -695,7 +721,7 @@
index_end = (u8*)ia + ndir->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "crosses page boundary. Impossible! Cannot "
- "access! This is probably a bug in the "
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx crosses page boundary. Impossible! "
+ "Cannot access! This is probably a bug in the "
"driver.", (long long)ia_pos >>
ndir->_IDM(index_vcn_size_bits),
@@ -707,6 +733,6 @@
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + ndir->_IDM(index_block_size)) {
- ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
- "inode %Li exceeds maximum size.",
+ ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+ "inode 0x%Lx exceeds maximum size.",
(long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -U2 -r1.69 -r1.70
--- inode.c 25 Feb 2002 04:00:58 -0000 1.69
+++ inode.c 4 Mar 2002 22:56:14 -0000 1.70
@@ -3,5 +3,4 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
- * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -79,11 +78,11 @@
atomic_set(&ni->count, 1);
ni->vol = NULL;
- ni->run_list = NULL;
+ INIT_RUN_LIST(&ni->run_list);
init_rwsem(&ni->mrec_lock);
atomic_set(&ni->mft_count, 0);
ni->page = NULL;
ni->attr_list = NULL;
- ni->attr_list_rl = NULL;
- ni->_IDM(bmp_rl) = NULL;
+ INIT_RUN_LIST(&ni->attr_list_rl);
+ INIT_RUN_LIST(&ni->_IDM(bmp_rl));
init_MUTEX(&ni->extent_lock);
ni->_INE(base_ntfs_ino) = NULL;
@@ -377,10 +376,13 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_AttrListNonResident;
- /* Setup the run list. */
- ni->attr_list_rl = decompress_mapping_pairs(vol,
+ /*
+ * Setup the run list. No need for locking as we have
+ * exclusive access to the inode at this time.
+ */
+ ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->attr_list_rl)) {
- err = PTR_ERR(ni->attr_list_rl);
- ni->attr_list_rl = NULL;
+ if (IS_ERR(ni->attr_list_rl.rl)) {
+ err = PTR_ERR(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -390,6 +392,9 @@
goto ec_put_unm_err_out;
}
- /* Now load the attribute list. */
- if ((err = load_attribute_list(vol, ni->attr_list_rl,
+ /*
+ * Now load the attribute list. Again no need for
+ * locking as above.
+ */
+ if ((err = load_attribute_list(vol, ni->attr_list_rl.rl,
ni->attr_list, ni->attr_list_size))) {
ntfs_error(vi->i_sb, "Failed to load "
@@ -448,5 +453,6 @@
if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
ntfs_error(vi->i_sb, "Found encrypted and "
- "compressed data.");
+ "compressed attribute. Not "
+ "allowed.");
goto put_unm_err_out;
}
@@ -540,24 +546,17 @@
goto put_unm_err_out;
}
- if (!sle64_to_cpu(ctx->attr->_ANR(lowest_vcn))) {
- vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
- ni->initialized_size = sle64_to_cpu(
- ctx->attr->_ANR(initialized_size));
- } else
- /*
- * Just a rough guess as ->*_size are not defined for
- * attribute extents. We could just find the base
- * attribute extent but this way is faster and not too
- * much off unless the directory is ridiculously big or
- * very fragmented or sparse.
- */
- vi->i_size = ni->initialized_size =
- sle64_to_cpu(ctx->attr->_ANR(highest_vcn))
- << vol->cluster_size_bits;
- /* Setup the run list. */
- ni->run_list = decompress_mapping_pairs(vol, ctx->attr, NULL);
- if (IS_ERR(ni->run_list)) {
- err = PTR_ERR(ni->run_list);
- ni->run_list = NULL;
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
+ ni->initialized_size = sle64_to_cpu(
+ ctx->attr->_ANR(initialized_size));
+ ni->allocated_size = sle64_to_cpu(ctx->attr->_ANR(allocated_size));
+ /*
+ * Setup the run list. No need for locking as we have exclusive
+ * access to the inode at this time.
+ */
+ ni->run_list.rl = decompress_mapping_pairs(vol, ctx->attr,
+ NULL);
+ if (IS_ERR(ni->run_list.rl)) {
+ err = PTR_ERR(ni->run_list.rl);
+ ni->run_list.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs decompression "
"failed with error code %i.", -err);
@@ -580,24 +579,19 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
- if (!sle64_to_cpu(ctx->attr->_ANR(lowest_vcn)))
- ni->_IDM(bmp_size) = sle64_to_cpu(
- ctx->attr->_ANR(data_size));
- else
- /*
- * Just a rough guess as ->*_size are not
- * defined for extents. We could just find the
- * base extent but this way is faster and not
- * too much off unless the directory is
- * ridiculously big / very fragmented or sparse.
- */
- ni->_IDM(bmp_size) = sle64_to_cpu(
- ctx->attr->_ANR(highest_vcn))
- << vol->cluster_size_bits;
- /* Setup the run list. */
- ni->_IDM(bmp_rl) = decompress_mapping_pairs(vol, ctx->attr,
+ ni->_IDM(bmp_size) = sle64_to_cpu(
+ ctx->attr->_ANR(data_size));
+ ni->_IDM(bmp_initialized_size) = sle64_to_cpu(
+ ctx->attr->_ANR(initialized_size));
+ ni->_IDM(bmp_allocated_size) = sle64_to_cpu(
+ ctx->attr->_ANR(allocated_size));
+ /*
+ * Setup the run list. No need for locking as we have
+ * exclusive access to the inode at this time.
+ */
+ ni->_IDM(bmp_rl).rl = decompress_mapping_pairs(vol, ctx->attr,
NULL);
- if (IS_ERR(ni->_IDM(bmp_rl))) {
- err = PTR_ERR(ni->_IDM(bmp_rl));
- ni->_IDM(bmp_rl) = NULL;
+ if (IS_ERR(ni->_IDM(bmp_rl).rl)) {
+ err = PTR_ERR(ni->_IDM(bmp_rl).rl);
+ ni->_IDM(bmp_rl).rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -606,12 +600,14 @@
}
} else
- ni->_IDM(bmp_size) = le32_to_cpu(ctx->attr->_ARA(value_length));
+ ni->_IDM(bmp_size) = ni->_IDM(bmp_initialized_size) =
+ ni->_IDM(bmp_allocated_size) =
+ le32_to_cpu(ctx->attr->_ARA(value_length));
/* Consistency check bitmap size vs. index allocation size. */
- if (ni->_IDM(bmp_size) << 3 < ni->initialized_size >>
+ if (ni->_IDM(bmp_size) << 3 < vi->i_size >>
ni->_IDM(index_block_size_bits)) {
ntfs_error(vi->i_sb, "$I30 bitmap too small (0x%Lx) "
"for index allocation (0x%Lx).",
(long long)ni->_IDM(bmp_size) << 3,
- (long long)ni->initialized_size);
+ vi->i_size);
goto put_unm_err_out;
}
@@ -632,8 +628,9 @@
vi->i_mapping->a_ops = &ntfs_dir_aops;
} else {
- /* It is a file, find the unnamed data attribute. */
+ /* It is a file: find first extent of unnamed data attribute. */
reinit_attr_search_ctx(ctx);
if (!lookup_attr(AT_DATA, NULL, 0, 0, 0, NULL, 0, ctx)) {
- vi->i_size = ni->initialized_size = 0LL;
+ vi->i_size = ni->initialized_size =
+ ni->allocated_size = 0LL;
/*
* FILE_Secure does not have an unnamed $DATA
@@ -659,5 +656,5 @@
goto put_unm_err_out;
}
- /* Set up the state. */
+ /* Setup the state. */
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_NonResident;
@@ -708,9 +705,14 @@
/* $MFT is special as we have the run_list already. */
if (likely(vi->i_ino != FILE_MFT)) {
- ni->run_list = decompress_mapping_pairs(vol,
+ /*
+ * Setup the run list. No need for locking as
+ * we have exclusive access to the inode at
+ * this time.
+ */
+ ni->run_list.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->run_list)) {
- err = PTR_ERR(ni->run_list);
- ni->run_list = NULL;
+ if (IS_ERR(ni->run_list.rl)) {
+ err = PTR_ERR(ni->run_list.rl);
+ ni->run_list.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed "
@@ -720,25 +722,22 @@
}
}
- if (sle64_to_cpu(ctx->attr->_ANR(lowest_vcn)))
- /*
- * Just a rough guess as ->*_size are not
- * defined for attribute extents. We could
- * just find the base attribute extent but
- * this way is faster and not too much off,
- * unless the file is ridiculously big or very
- * fragmented or compressed or sparse.
- */
- vi->i_size = ni->initialized_size =
- sle64_to_cpu(
- ctx->attr->_ANR(highest_vcn)) <<
- vol->cluster_size_bits;
- else {
- vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
- ni->initialized_size = sle64_to_cpu(
- ctx->attr->_ANR(initialized_size));
- }
+ /* Setup all the sizes. */
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
+ ni->initialized_size = sle64_to_cpu(
+ ctx->attr->_ANR(initialized_size));
+ ni->allocated_size = sle64_to_cpu(
+ ctx->attr->_ANR(allocated_size));
+ if (NInoCompressed(ni))
+ ni->_ICF(compressed_size) = sle64_to_cpu(
+ ctx->attr->_ANR(compressed_size));
} else { /* Resident attribute. */
- vi->i_size = le32_to_cpu(ctx->attr->_ARA(value_length));
- ni->initialized_size = 0LL;
+ /*
+ * Make all sizes equal for simplicity in read code
+ * paths. FIXME: Need to keep this in mind when
+ * converting to non-resident attribute in write code
+ * path. (Probably only affects truncate().)
+ */
+ vi->i_size = ni->initialized_size = ni->allocated_size =
+ le32_to_cpu(ctx->attr->_ARA(value_length));
}
no_data_attr_special_case:
@@ -757,6 +756,19 @@
vi->i_mapping->a_ops = &ntfs_file_aops;
}
- /* The number of 512-byte blocks (for stat). */
- vi->i_blocks = vi->i_size >> 9;
+ /*
+ * The number of 512-byte blocks used on disk (for stat). This is in so
+ * far inaccurate as it doesn't account for any named streams or other
+ * special non-resident attributes, but that is how Windows works, too,
+ * so we are at least consistent with Windows, if not entirely
+ * consistent with the Linux Way. Doing it the Linux Way would cause a
+ * significant slowdown as it would involve iterating over all
+ * attributes in the mft record and adding the allocated/compressed
+ * sizes of all non-resident attributes present to give us the Linux
+ * correct size that should go into i_blocks (after division by 512).
+ */
+ if (!NInoCompressed(ni))
+ vi->i_blocks = ni->allocated_size >> 9;
+ else
+ vi->i_blocks = ni->_ICF(compressed_size) >> 9;
/* Done. */
put_attr_search_ctx(ctx);
@@ -918,9 +930,9 @@
ni->state |= 1 << NI_AttrListNonResident;
/* Setup the run list. */
- ni->attr_list_rl = decompress_mapping_pairs(vol,
+ ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->attr_list_rl)) {
- err = PTR_ERR(ni->attr_list_rl);
- ni->attr_list_rl = NULL;
+ if (IS_ERR(ni->attr_list_rl.rl)) {
+ err = PTR_ERR(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
ntfs_error(sb, "Mapping pairs decompression "
"failed with error code %i.",
@@ -929,5 +941,5 @@
}
/* Now load the attribute list. */
- if ((err = load_attribute_list(vol, ni->attr_list_rl,
+ if ((err = load_attribute_list(vol, ni->attr_list_rl.rl,
ni->attr_list, ni->attr_list_size))) {
ntfs_error(sb, "Failed to load attribute list "
@@ -1016,5 +1028,5 @@
next_vcn = last_vcn = highest_vcn = 0;
while (lookup_attr(AT_DATA, NULL, 0, 0, next_vcn, NULL, 0, ctx)) {
- run_list *nrl;
+ run_list_element *nrl;
/* Cache the current attribute. */
@@ -1037,8 +1049,10 @@
}
/*
- * Decompress the mapping pairs array of this extent
- * and merge the result into the existing run list.
+ * Decompress the mapping pairs array of this extent and merge
+ * the result into the existing run list. No need for locking
+ * as we have exclusive access to the inode at this time and we
+ * are a mount in progress task, too.
*/
- nrl = decompress_mapping_pairs(vol, attr, ni->run_list);
+ nrl = decompress_mapping_pairs(vol, attr, ni->run_list.rl);
if (IS_ERR(nrl)) {
ntfs_error(sb, "decompress_mapping_pairs() failed with "
@@ -1047,5 +1061,5 @@
goto put_err_out;
}
- ni->run_list = nrl;
+ ni->run_list.rl = nrl;
/* Are we in the first extent? */
@@ -1058,4 +1072,6 @@
ni->initialized_size =
sle64_to_cpu(attr->_ANR(initialized_size));
+ ni->allocated_size =
+ sle64_to_cpu(attr->_ANR(allocated_size));
/* Set the number of mft records. */
vol->_VMM(nr_mft_records) = vi->i_size >>
@@ -1238,7 +1254,15 @@
}
/* Free all alocated memory. */
- ntfs_free(ni->run_list);
+ write_lock(&ni->run_list.lock);
+ ntfs_free(ni->run_list.rl);
+ ni->run_list.rl = NULL;
+ write_unlock(&ni->run_list.lock);
+
ntfs_free(ni->attr_list);
- ntfs_free(ni->attr_list_rl);
+
+ write_lock(&ni->attr_list_rl.lock);
+ ntfs_free(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
+ write_unlock(&ni->attr_list_rl.lock);
}
@@ -1267,6 +1291,9 @@
__ntfs_clear_inode(ni);
- if (S_ISDIR(vi->i_mode))
- ntfs_free(ni->_IDM(bmp_rl));
+ if (S_ISDIR(vi->i_mode)) {
+ write_lock(&ni->_IDM(bmp_rl).lock);
+ ntfs_free(ni->_IDM(bmp_rl).rl);
+ write_unlock(&ni->_IDM(bmp_rl).lock);
+ }
return;
}
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -U2 -r1.50 -r1.51
--- mft.c 25 Feb 2002 04:00:58 -0000 1.50
+++ mft.c 4 Mar 2002 22:56:14 -0000 1.51
@@ -149,5 +149,5 @@
* Note, we only setup asynchronous I/O on the page and return. I/O completion
* is signalled via our asynchronous I/O completion handler
- * end_buffer_read_mft_async().
+ * end_buffer_read_index_async().
*/
static int ntfs_mft_readpage(struct file *file, struct page *page)
@@ -182,5 +182,5 @@
blocks = PAGE_CACHE_SIZE >> blocksize_bits;
iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
- lblock = (ni->initialized_size + blocksize - 1) >> blocksize_bits;
+ lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits;
bh = head = page->buffers;
@@ -188,5 +188,5 @@
#ifdef DEBUG
- if (!ni->run_list)
+ if (!ni->run_list.rl)
panic("NTFS: $MFT/$DATA run list has been unmapped! This is a "
"very serious bug! Cannot continue...");
@@ -206,5 +206,7 @@
vol->cluster_size_mask;
/* Convert the vcn to the corresponding lcn. */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
if (lcn >= 0) {
/* Setup buffer head to correct block. */
@@ -217,5 +219,5 @@
}
ntfs_error(sb, "vcn_to_lcn(vcn = 0x%Lx) failed with "
- "error code %Li.", (long long)vcn,
+ "error code 0x%Lx.", (long long)vcn,
(long long)-lcn);
// FIXME: Depending on vol->on_errors, do something.
Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- ntfs.h 25 Feb 2002 04:00:58 -0000 1.30
+++ ntfs.h 4 Mar 2002 22:56:14 -0000 1.31
@@ -25,11 +25,4 @@
#define _LINUX_NTFS_H
-/* Make sure gcc-2.96 or higher is being used. */
-/*
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-# error The NTFS driver can only be compiled with gcc-2.96 or later.
-#endif
-*/
-
#include <linux/version.h>
@@ -226,6 +219,6 @@
int val;
char *str;
-} on_errors_str;
-extern on_errors_str on_errors_arr[];
+} option_t;
+extern const option_t on_errors_arr[];
/* From fs/ntfs/compress.c */
Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -U2 -r1.78 -r1.79
--- super.c 25 Feb 2002 04:00:58 -0000 1.78
+++ super.c 4 Mar 2002 22:56:15 -0000 1.79
@@ -35,5 +35,5 @@
static unsigned long ntfs_nr_compression_users = 0;
-/* Error constants/strings from super.c used in inode.c::ntfs_show_options(). */
+/* Error constants/strings used in inode.c::ntfs_show_options(). */
typedef enum {
ON_ERRORS_PANIC = 0x01,
@@ -43,16 +43,47 @@
} ON_ERRORS_ACTIONS;
-on_errors_str on_errors_arr[] = {
- { ON_ERRORS_PANIC, "panic" },
- { ON_ERRORS_REMOUNT_RO, "remount-ro", },
- { ON_ERRORS_CONTINUE, "continue", },
- { ON_ERRORS_RECOVER, "recover" },
- { ON_ERRORS_RECOVER || ON_ERRORS_PANIC, "recover_or_panic" },
- { ON_ERRORS_RECOVER || ON_ERRORS_REMOUNT_RO, "recover_or_remount-ro" },
- { ON_ERRORS_RECOVER || ON_ERRORS_CONTINUE, "recover_or_continue" },
- { 0, NULL }
+const option_t on_errors_arr[] = {
+ { ON_ERRORS_PANIC, "panic" },
+ { ON_ERRORS_REMOUNT_RO, "remount-ro", },
+ { ON_ERRORS_CONTINUE, "continue", },
+ { ON_ERRORS_RECOVER, "recover" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_PANIC, "recover_or_panic" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_REMOUNT_RO, "recover_or_remount-ro" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_CONTINUE, "recover_or_continue" },
+ { 0, NULL }
+};
+
+static const option_t readdir_opts_arr[] = {
+ { SHOW_SYSTEM, "system" },
+ { SHOW_WIN32, "win32" },
+ { SHOW_WIN32, "long" },
+ { SHOW_DOS, "dos" },
+ { SHOW_DOS, "short" },
+ { SHOW_POSIX, "posix" },
+ { SHOW_ALL, "all" },
+ { 0, NULL }
};
/**
+ * simple_getbool -
+ *
+ * Copied from old ntfs driver (which copied from vfat driver).
+ */
+static int simple_getbool(char *s, BOOL *setval)
+{
+ if (s) {
+ if (!strcmp(s, "1") || !strcmp(s, "yes") || !strcmp(s, "true"))
+ *setval = TRUE;
+ else if (!strcmp(s, "0") || !strcmp(s, "no") ||
+ !strcmp(s, "false"))
+ *setval = FALSE;
+ else
+ return 0;
+ } else
+ *setval = TRUE;
+ return 1;
+}
+
+/**
* parse_options - parse the (re)mount options
* @vol: ntfs volume
@@ -64,10 +95,11 @@
{
char *p, *v, *ov;
+ static char *utf8 = "utf8";
int errors = 0, sloppy = 0;
uid_t uid = (uid_t)-1;
gid_t gid = (gid_t)-1;
mode_t fmask = (mode_t)-1, dmask = (mode_t)-1;
- int mft_zone_multiplier = -1, on_errors = -1;
- struct nls_table *nls_map = NULL;
+ int mft_zone_multiplier = -1, on_errors = -1, readdir_opts = -1;
+ struct nls_table *nls_map = NULL, *old_nls;
/* I am lazy... (-8 */
@@ -120,8 +152,49 @@
else NTFS_GETOPT_OPTIONS_ARRAY("errors", on_errors,
on_errors_arr)
- else if (!strcmp(p, "nls") || !strcmp(p, "iocharset")) {
- struct nls_table *old_nls;
+ else NTFS_GETOPT_OPTIONS_ARRAY("show_inodes", readdir_opts,
+ readdir_opts_arr)
+ else if (!strcmp(p, "show_system_files")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option show_system_files is "
+ "deprecated. Please use option "
+ "show_inodes=system in the future.");
+ if (!v || !*v)
+ val = TRUE;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ if (readdir_opts == -1)
+ readdir_opts = 0;
+ readdir_opts |= SHOW_SYSTEM;
+ }
+ } else if (!strcmp(p, "posix")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option posix is deprecated. "
+ "Please use option show_inodes=posix "
+ "instead. Be aware that some userspace "
+ "applications may be confused by this, "
+ "since the short and long names of "
+ "directory inodes will have the same inode "
+ "numbers, yet each will only have a link "
+ "count of 1 due to Linux not supporting "
+ "directory hard links.");
+ if (!v || !*v)
+ goto needs_arg;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ if (readdir_opts == -1)
+ readdir_opts = 0;
+ readdir_opts |= SHOW_POSIX;
+ }
+ } else if (!strcmp(p, "nls") || !strcmp(p, "iocharset")) {
+ if (!strcmp(p, "iocharset"))
+ ntfs_warning(vol->sb, "Option iocharset is "
+ "deprecated. Please use "
+ "option nls=<charsetname> in "
+ "the future.");
if (!v || !*v)
goto needs_arg;
+use_utf8:
old_nls = nls_map;
nls_map = load_nls(v);
@@ -140,4 +213,19 @@
unload_nls(old_nls);
}
+ } else if (!strcmp(p, "utf8")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option utf8 is no longer "
+ "supported, using option nls=utf8. Please "
+ "use option nls=utf8 in the future and "
+ "make sure utf8 is compiled either as a "
+ "module or into the kernel.");
+ if (!v || !*v)
+ val = TRUE;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ v = utf8;
+ goto use_utf8;
+ }
} else {
ntfs_error(vol->sb, "Unrecognized mount option %s.", p);
@@ -211,8 +299,13 @@
if (dmask != (mode_t)-1)
vol->dmask = dmask;
+ if (readdir_opts != -1)
+ vol->readdir_opts = readdir_opts;
return TRUE;
needs_arg:
ntfs_error(vol->sb, "The %s option requires an argument.", p);
return FALSE;
+needs_bool:
+ ntfs_error(vol->sb, "The %s option requires a boolean argument.", p);
+ return FALSE;
needs_val:
ntfs_error(vol->sb, "Invalid %s option argument: %s", p, ov);
@@ -339,28 +432,4 @@
/**
- * get_nr_blocks - get the number of NTFS_BLOCK_SIZE blocks on a device
- * @dev: device
- *
- * Get the number of NTFS_BLOCK_SIZE bytes sized blocks on the device @dev and
- * return it if successful or return 0 on error.
- *
- * FIXME: At the moment, we are happy as the kernel uses 512 byte blocks, which
- * also happens to be the NTFS_BLOCK_SIZE. In the future, when the kernel
- * implementation changes, this function will need to change to convert the
- * number into NTFS_BLOCK_SIZE sized blocks.
- */
-static long get_nr_blocks(const kdev_t dev)
-{
- struct gendisk *gd = get_gendisk(dev);
-
- if (gd)
- return gd->part[minor(dev)].nr_sects;
- if ((major(dev) == LOOP_MAJOR) && blk_size[major(dev)])
- return blk_size[major(dev)][minor(dev)] << BLOCK_SIZE_BITS
- >> NTFS_BLOCK_SIZE_BITS;
- return (long)0;
-}
-
-/**
* read_boot_sector - read the NTFS boot sector of a device
* @sb: super block of device to read the boot sector from
@@ -562,5 +631,5 @@
}
vol->_VCL(nr_clusters) = ll;
- ntfs_debug("vol->_VCL(nr_clusters) = 0x%Lx", (long long)vol->_VCL(nr_clusters));
+ ntfs_debug("vol->nr_clusters = 0x%Lx", (long long)vol->_VCL(nr_clusters));
ll = sle64_to_cpu(b->mft_lcn);
if (ll >= vol->_VCL(nr_clusters)) {
@@ -618,5 +687,5 @@
/**
- * load_and_init_upcase -
+ * load_and_init_upcase - load the upcase table for an ntfs volume
* @vol: ntfs super block describing device whose upcase to load
*
@@ -654,24 +723,12 @@
size = PAGE_CACHE_SIZE;
while (index < max_index) {
+ /* Read the upcase table and copy it into the linear buffer. */
read_partial_upcase_page:
- /*
- * Read the page from page cache, getting it from backing store
- * if necessary, and increment the use count.
- */
- page = read_cache_page(ino->i_mapping, index, (filler_t*)
- ino->i_mapping->a_ops->readpage, NULL);
+ page = ntfs_map_page(ino->i_mapping, index);
if (IS_ERR(page))
- /* Sync io failed. */
- goto iput_upcase_failed;
- wait_on_page(page);
- if (!Page_Uptodate(page)) {
- /* Async io failed. */
- page_cache_release(page);
goto iput_upcase_failed;
- }
memcpy((char*)vol->upcase + (index++ << PAGE_CACHE_SHIFT),
- kmap(page), size);
- kunmap(page);
- page_cache_release(page);
+ page_address(page), size);
+ ntfs_unmap_page(page);
};
if (size == PAGE_CACHE_SIZE) {
@@ -680,5 +737,5 @@
goto read_partial_upcase_page;
}
- vol->upcase_len = ino->i_size >> 1 /* uchar_t_size_shift */;
+ vol->upcase_len = ino->i_size >> UCHAR_T_SIZE_BITS;
ntfs_debug("Read %Lu bytes from $UpCase (expected %u bytes).",
ino->i_size, 64 * 1024 * sizeof(uchar_t));
@@ -692,5 +749,5 @@
}
max = default_upcase_len;
- if (vol->upcase_len < default_upcase_len)
+ if (max > vol->upcase_len)
max = vol->upcase_len;
for (i = 0; i < max; i++)
@@ -749,5 +806,5 @@
VOLUME_INFORMATION *vi;
attr_search_context *ctx;
- run_list *rl;
+ run_list_element *rl;
ntfs_debug("Entering.");
@@ -770,5 +827,5 @@
next_vcn = last_vcn = highest_vcn = 0;
while (lookup_attr(AT_BITMAP, NULL, 0, 0, next_vcn, NULL, 0, ctx)) {
- run_list *nrl;
+ run_list_element *nrl;
/* Cache the current attribute extent. */
@@ -792,5 +849,7 @@
/*
* Decompress the mapping pairs array of this extent
- * and merge the result into the existing run list.
+ * and merge the result into the existing run list. Note we
+ * don't need any locking at this stage as we are already
+ * running exclusively as we are mount in progress task.
*/
nrl = decompress_mapping_pairs(vol, attr, rl);
@@ -808,9 +867,11 @@
last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
vol->cluster_size_bits;
+ vol->mftbmp_size = sle64_to_cpu(attr->_ANR(data_size));
vol->mftbmp_initialized_size =
sle64_to_cpu(attr->_ANR(initialized_size));
+ vol->mftbmp_allocated_size =
+ sle64_to_cpu(attr->_ANR(allocated_size));
/* Consistency check. */
- if (vol->mftbmp_initialized_size <
- (vol->_VMM(nr_mft_records) + 7) >> 3) {
+ if (vol->mftbmp_size < (vol->_VMM(nr_mft_records) + 7) >> 3) {
ntfs_error(sb, "$MFT/$BITMAP is too short to "
"contain a complete mft "
@@ -862,8 +923,6 @@
}
- down_write(&vol->mftbmp_lock);
-
/* Setup the run list and the address space in the volume structure. */
- vol->mftbmp_rl = rl;
+ vol->mftbmp_rl.rl = rl;
vol->mftbmp_mapping.a_ops = &ntfs_mftbmp_aops;
@@ -871,6 +930,4 @@
vol->mftbmp_mapping.host = NULL;
- up_write(&vol->mftbmp_lock);
-
// FIXME: If mounting read-only, it would be ok to ignore errors when
// loading the mftbmp but we then need to make sure nobody remounts the
@@ -891,8 +948,10 @@
if (!load_and_init_upcase(vol))
goto iput_mirr_err_out;
- /* Get the cluster allocation bitmap inode and verify the size. */
- down_write(&vol->lcnbmp_lock);
+ /*
+ * Get the cluster allocation bitmap inode and verify the size, no
+ * need for any locking at this stage as we are already running
+ * exclusively as we are mount in progress task.
+ */
vol->lcnbmp_ino = iget(sb, FILE_Bitmap);
- up_write(&vol->lcnbmp_lock);
if (!vol->lcnbmp_ino || is_bad_inode(vol->lcnbmp_ino)) {
if (is_bad_inode(vol->lcnbmp_ino))
@@ -1066,17 +1125,20 @@
/*
* Clean up mft bitmap address space. Ignore the _inode_ bit in the
- * name...
+ * name of the function... FIXME: What does this do with dirty pages?
+ * (ask Al Viro)
*/
truncate_inode_pages(&vol->mftbmp_mapping, 0);
vol->mftbmp_mapping.a_ops = NULL;
vol->mftbmp_mapping.host = NULL;
- ntfs_free(vol->mftbmp_rl);
- vol->mftbmp_rl = NULL;
up_write(&vol->mftbmp_lock);
+ write_lock(&vol->mftbmp_rl.lock);
+ ntfs_free(vol->mftbmp_rl.rl);
+ vol->mftbmp_rl.rl = NULL;
+ write_unlock(&vol->mftbmp_rl.lock);
vol->upcase_len = 0;
/*
* Decrease the number of mounts and destroy the global default upcase
* table if necessary. Also decrease the number of upcase users if we
- * are were user.
+ * are a user.
*/
down(&ntfs_lock);
@@ -1391,10 +1453,10 @@
/**
- * ntfs_read_super - mount an ntfs files system
+ * ntfs_fill_super - mount an ntfs files system
* @sb: super block of ntfs file system to mount
* @opt: string containing the mount options
* @silent: silence error output
*
- * ntfs_read_super() is called by the VFS to mount the device described by @sb
+ * ntfs_fill_super() is called by the VFS to mount the device described by @sb
* with the mount otions in @data with the NTFS file system.
*
@@ -1408,6 +1470,5 @@
* NOTE: @sb->s_flags contains the mount options flags.
*/
-struct super_block *ntfs_read_super(struct super_block *sb, void *opt,
- const int silent)
+static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
{
extern int *blksize_size[];
@@ -1426,5 +1487,5 @@
ntfs_error(sb, "Allocation of NTFS volume structure "
"failed. Aborting mount...");
- goto imm_err_out_now;
+ return -ENOMEM;
}
/* Initialize ntfs_volume structure. */
@@ -1442,5 +1503,5 @@
vol->mftbmp_mapping.i_mmap_shared = NULL;
spin_lock_init(&vol->mftbmp_mapping.i_shared_lock);
- vol->mftbmp_rl = NULL;
+ INIT_RUN_LIST(&vol->mftbmp_rl);
vol->mftmirr_ino = NULL;
vol->lcnbmp_ino = NULL;
@@ -1453,4 +1514,5 @@
vol->mft_zone_multiplier = 0;
vol->nls_map = NULL;
+
/*
* Default is group and other don't have write/execute access to files
@@ -1460,4 +1522,10 @@
vol->dmask = 0022;
+ /*
+ * Default is to show long file names (including POSIX file names), and
+ * not to show system files and short file names.
+ */
+ vol->readdir_opts = SHOW_WIN32;
+
/* Important to get the mount options dealt with now. */
if (!parse_options(vol, (char*)opt))
@@ -1488,10 +1556,6 @@
}
- /* Get the size of the device in NTFS_BLOCK_SIZE byte blocks. */
- if (!(vol->nr_blocks = get_nr_blocks(dev))) {
- if (!silent)
- ntfs_error(sb, "Unable to determine device size.");
- goto set_blk_size_err_out_now;
- }
+ /* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */
+ vol->nr_blocks = sb->s_bdev->bd_inode->i_size >> NTFS_BLOCK_SIZE_BITS;
/* Read the boot sector and return unlocked buffer head to it. */
@@ -1524,5 +1588,14 @@
/* Setup remaining fields in the super block. */
sb->s_magic = NTFS_SB_MAGIC;
- sb->s_maxbytes = ~0ULL >> 1;
+
+ /*
+ * Ntfs allows 63 bits for the file size, i.e. correct would be:
+ * sb->s_maxbytes = ~0ULL >> 1;
+ * But the kernel uses a long as the page cache page index which on
+ * 32-bit architectures is only 32-bits. MAX_LFS_FILESIZE is kernel
+ * defined to the maximum the page cache page index can cope with
+ * without overflowing the index or to 2^63 - 1, whichever is smaller.
+ */
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
/*
@@ -1609,5 +1682,5 @@
}
up(&ntfs_lock);
- return sb;
+ return 0;
}
ntfs_error(sb, "Failed to allocate root directory.");
@@ -1626,6 +1699,9 @@
iput(vol->mftmirr_ino);
vol->mftmirr_ino = NULL;
- ntfs_free(vol->mftbmp_rl);
- vol->mftbmp_rl = NULL;
+ truncate_inode_pages(&vol->mftbmp_mapping, 0);
+ vol->mftbmp_mapping.a_ops = NULL;
+ vol->mftbmp_mapping.host = NULL;
+ ntfs_free(vol->mftbmp_rl.rl);
+ vol->mftbmp_rl.rl = NULL;
vol->upcase_len = 0;
if (vol->upcase != default_upcase)
@@ -1678,7 +1754,6 @@
sb->u.generic_sbp = NULL;
kfree(vol);
-imm_err_out_now:
- ntfs_debug("Exiting, status failed.");
- return NULL;
+ ntfs_debug("Failed, returning -EINVAL.");
+ return -EINVAL;
}
@@ -1721,18 +1796,6 @@
DECLARE_MUTEX(ntfs_lock);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
-static DECLARE_FSTYPE_DEV(ntfs_fs_type, "ntfs", ntfs_read_super);
-#else
-
-int ntfs_fill_super(struct super_block *sb, void *opt, int silent)
-{
- if (ntfs_read_super(sb, opt, silent))
- return 0;
- else
- return -EINVAL;
-}
-
static struct super_block *ntfs_get_sb(struct file_system_type *fs_type,
- int flags, char *dev_name, void *data)
+ int flags, char *dev_name, void *data)
{
return get_sb_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);
@@ -1745,5 +1808,10 @@
fs_flags: FS_REQUIRES_DEV,
};
-#endif /* VERSION >= 2.5.4 */
+
+/* Stable names for the slab caches. */
+static const char *ntfs_attr_ctx_cache_name = "ntfs_attr_ctx_cache";
+static const char *ntfs_name_cache_name = "ntfs_name_cache";
+static const char *ntfs_inode_cache_name = "ntfs_inode_cache";
+static const char *ntfs_big_inode_cache_name = "ntfs_big_inode_cache";
static int __init init_ntfs_fs(void)
@@ -1768,34 +1836,36 @@
ntfs_debug("Debug messages are enabled.");
- ntfs_attr_ctx_cache = kmem_cache_create("ntfs_actx_cache",
+ ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name,
sizeof(attr_search_context), 0 /* offset */,
SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */);
if (!ntfs_attr_ctx_cache) {
- printk(KERN_CRIT "NTFS: Failed to create "
- "ntfs_actx_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_attr_ctx_cache_name);
goto ctx_err_out;
}
- ntfs_name_cache = kmem_cache_create("ntfs_name_cache",
+ ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name,
(NTFS_MAX_NAME_LEN+1) * sizeof(uchar_t), 0,
SLAB_HWCACHE_ALIGN, NULL, NULL);
if (!ntfs_name_cache) {
- printk(KERN_CRIT "NTFS: Failed to create ntfs_name_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_name_cache_name);
goto name_err_out;
}
- ntfs_inode_cache = kmem_cache_create("ntfs_inode_cache",
+ ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,
sizeof(ntfs_inode), 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
if (!ntfs_inode_cache) {
- printk(KERN_CRIT "NTFS: Failed to create ntfs_inode_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_inode_cache_name);
goto inode_err_out;
}
- ntfs_big_inode_cache = kmem_cache_create("ntfs_b_inode_cache",
+ ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,
sizeof(big_ntfs_inode), 0, SLAB_HWCACHE_ALIGN,
ntfs_big_inode_init_once, NULL);
if (!ntfs_big_inode_cache) {
- printk(KERN_CRIT "NTFS: Failed to create "
- "ntfs_big_inode_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_big_inode_cache_name);
goto big_inode_err_out;
}
@@ -1841,12 +1911,15 @@
if (kmem_cache_destroy(ntfs_big_inode_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy "
- "ntfs_big_inode_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_big_inode_cache_name);
if (kmem_cache_destroy(ntfs_inode_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_inode_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_inode_cache_name);
if (kmem_cache_destroy(ntfs_name_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_name_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_name_cache_name);
if (kmem_cache_destroy(ntfs_attr_ctx_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_actx_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_attr_ctx_cache_name);
if (err)
printk(KERN_CRIT "NTFS: This causes memory to leak! There is "
Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/types.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- types.h 3 Feb 2002 19:31:17 -0000 1.3
+++ types.h 4 Mar 2002 22:56:15 -0000 1.4
@@ -26,4 +26,5 @@
/* 2-byte Unicode character type. */
typedef u16 uchar_t;
+#define UCHAR_T_SIZE_BITS 1
/*
@@ -35,5 +36,5 @@
/**
- * run_list - in memory vcn to lcn mapping array
+ * run_list_element - in memory vcn to lcn mapping array element
* @vcn: starting vcn of the current array element
* @lcn: starting lcn of the current array element
@@ -49,5 +50,26 @@
LCN lcn; /* lcn = Starting logical cluster number. */
s64 length; /* Run length in clusters. */
+} run_list_element;
+
+/**
+ * run_list - in memory vcn to lcn mapping array including a read/write lock
+ * @rl: pointer to an array of run list elements
+ * @lock: read/write spinlock for serializing access to @rl
+ *
+ */
+typedef struct {
+ run_list_element *rl;
+ rwlock_t lock;
} run_list;
+
+#define RUN_LIST_INIT { NULL, RW_LOCK_UNLOCKED }
+
+#define RUN_LIST(name) run_list name = RUN_LIST_INIT
+
+#define INIT_RUN_LIST(runlist) do { \
+ run_list *___rl = runlist; \
+ ___rl->rl = NULL; \
+ ___rl->lock = RW_LOCK_UNLOCKED; \
+ } while (0)
typedef enum {
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/volume.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- volume.h 25 Feb 2002 04:00:58 -0000 1.7
+++ volume.h 4 Mar 2002 22:56:15 -0000 1.8
@@ -27,4 +27,17 @@
#include "types.h"
+/* These are used to determine which inode names are returned by readdir(). */
+typedef enum {
+ SHOW_SYSTEM = 1,
+ SHOW_WIN32 = 2,
+ SHOW_DOS = 4,
+ SHOW_POSIX = SHOW_WIN32 | SHOW_DOS,
+ SHOW_ALL = SHOW_SYSTEM | SHOW_POSIX,
+} READDIR_OPTIONS;
+
+#define RHideSystemFiles(x) (!((x) & SHOW_SYSTEM))
+#define RHideLongNames(x) (!((x) & SHOW_WIN32))
+#define RHideDosNames(x) (!((x) & SHOW_DOS))
+
/*
* The NTFS in memory super block structure.
@@ -50,4 +63,5 @@
mode_t dmask; /* The mask for directory
permissions. */
+ READDIR_OPTIONS readdir_opts; /* Namespace of inode names to show. */
u8 mft_zone_multiplier; /* Initial mft zone multiplier. */
u8 on_errors; /* What to do on file system errors. */
@@ -84,6 +98,8 @@
} SN(vmm);
struct address_space mftbmp_mapping; /* Page cache for $MFT/$BITMAP. */
- run_list *mftbmp_rl; /* Run list for $MFT/$BITMAP. */
+ run_list mftbmp_rl; /* Run list for $MFT/$BITMAP. */
+ s64 mftbmp_size; /* Data size of $MFT/$BITMAP. */
s64 mftbmp_initialized_size; /* Initialized size of $MFT/$BITMAP. */
+ s64 mftbmp_allocated_size; /* Allocated size of $MFT/$BITMAP. */
struct inode *mftmirr_ino; /* The VFS inode of $MFTMirr. */
struct inode *lcnbmp_ino; /* The VFS inode of $Bitmap. */
|
|
From: Richard R. <fl...@us...> - 2002-03-04 22:42:52
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20799/linux/fs/ntfs
Modified Files:
Tag: pre-95
aops.c attrib.c attrib.h compress.c dir.c inode.c layout.h
mft.c ntfs.h super.c volume.h
Log Message:
merged gcc-2.95 and Anton's holiday changes
Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.53.4.1
retrieving revision 1.53.4.2
diff -U2 -r1.53.4.1 -r1.53.4.2
--- aops.c 4 Mar 2002 19:04:02 -0000 1.53.4.1
+++ aops.c 4 Mar 2002 22:42:49 -0000 1.53.4.2
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -234,5 +235,5 @@
/* The total length of the attribute value. */
- attr_len = le32_to_cpu(ctx->attr->value_length);
+ attr_len = le32_to_cpu(ctx->attr->_ARA(value_length));
/* Map the page so we can access it. */
@@ -254,5 +255,5 @@
/* Copy the data to the page. */
memcpy(page_addr, attr_pos + (char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset), bytes);
+ le16_to_cpu(ctx->attr->_ARA(value_offset)), bytes);
} else
memset(page_addr, 0, PAGE_CACHE_SIZE);
@@ -343,5 +344,5 @@
blocks = PAGE_CACHE_SIZE >> blocksize_bits;
iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
- lblock = (((vol->nr_mft_records + 7) >> 3) + blocksize - 1) >>
+ lblock = (((vol->_VMM(nr_mft_records) + 7) >> 3) + blocksize - 1) >>
blocksize_bits;
ntfs_debug("blocks = 0x%x, iblock = 0x%lx, lblock = 0x%lx.", blocks,
@@ -473,5 +474,5 @@
addr = kmap_atomic(page, KM_BIO_IRQ);
- rec_size = ni->index_block_size;
+ rec_size = ni->_IDM(index_block_size);
recs = PAGE_CACHE_SIZE / rec_size;
for (i = 0; i < recs; i++) {
@@ -485,5 +486,5 @@
(long long)((page->index <<
PAGE_CACHE_SHIFT >>
- ni->index_block_size_bits) + i));
+ ni->_IDM(index_block_size_bits)) + i));
}
kunmap_atomic(addr, KM_BIO_IRQ);
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.65.4.1
retrieving revision 1.65.4.2
diff -U2 -r1.65.4.1 -r1.65.4.2
--- attrib.c 4 Mar 2002 19:04:02 -0000 1.65.4.1
+++ attrib.c 4 Mar 2002 22:42:49 -0000 1.65.4.2
@@ -3,5 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
- * Copyright (C) 2002 Richard Russon <nt...@fl...>
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -127,5 +127,5 @@
*
* Append a run_list after element @loc in @orig. Merge the right end of
- * the new run_list, if necesary. Adjust the size of the hole before the
+ * the new run_list, if necessary. Adjust the size of the hole before the
* appended run_list.
*
@@ -145,19 +145,22 @@
BUG_ON (!orig || !new);
+ /* First, merge the right hand end, if necessary. */
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
+ /* Space required: Orig size + New size, less one if we merged. */
res = ntfs_rl_realloc (orig, osize, osize + nsize - right);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + 1 + nsize, loc + 1 + right, osize - loc - 1 - right);
rl_mc (res, loc + 1, new, 0, nsize);
+ /* Adjust the size of the preceding hole. */
res[loc].length = res[loc+1].vcn - res[loc].vcn;
- if (!right) {
- if (res[loc+nsize+1].lcn == LCN_ENOENT)
- res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
- }
+ /* We may have changed the length of the file, so fix the end marker */
+ if (res[loc+nsize+1].lcn == LCN_ENOENT)
+ res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
return res;
@@ -173,5 +176,5 @@
*
* Insert a run_list before element @loc in @orig. Merge the left end of
- * the new run_list, if necesary. Adjust the size of the hole after the
+ * the new run_list, if necessary. Adjust the size of the hole after the
* inserted run_list.
*
@@ -193,5 +196,11 @@
BUG_ON (!orig || !new);
- if (loc > 0) {
+ /* disc => Discontinuity between the end of Orig and the start of New.
+ * This means we might need to insert a hole.
+ * hole => Orig ends with a hole or an unmapped region which we can
+ * extend to match the discontinuity. */
+ if (loc == 0) {
+ disc = (new[0].vcn > 0);
+ } else {
left = ntfs_rl_merge (orig + loc - 1, new);
@@ -199,21 +208,17 @@
if (disc)
hole = (orig[loc-1].lcn == LCN_HOLE);
- } else {
- disc = (new[0].vcn > 0);
}
+ /* Space required: Orig size + New size, less one if we merged,
+ * plus one if there was a discontinuity, less one for a trailing hole */
res = ntfs_rl_realloc (orig, osize, osize + nsize - left + disc - hole);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + nsize - left + disc - hole, loc, osize - loc);
rl_mc (res, loc + disc - hole, new, left, nsize - left);
- if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
- (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
- res[loc+nsize-left+disc-hole].length -= (new[nsize-1].vcn +
- new[nsize-1].length - new[0].vcn);
- }
-
+ /* Adjust the VCN of the last run ... */
if (res[loc+nsize-left+disc-hole].lcn <= LCN_HOLE) {
res[loc+nsize-left+disc-hole].vcn =
@@ -221,5 +226,13 @@
res[loc+nsize-left+disc-hole-1].length;
}
+ /* ... and the length. */
+ if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
+ (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
+ res[loc+nsize-left+disc-hole].length =
+ res[loc+nsize-left+disc-hole+1].vcn -
+ res[loc+nsize-left+disc-hole].vcn;
+ }
+ /* Writing beyond the end of the file and there's a discontinuity. */
if (disc) {
if (hole) {
@@ -236,7 +249,5 @@
res[loc].lcn = LCN_RL_NOT_MAPPED;
}
- }
- if (disc) {
if (res[loc+nsize-left+disc].lcn == LCN_ENOENT)
res[loc+nsize-left+disc].vcn = res[loc+nsize-left+disc-1].vcn +
@@ -256,5 +267,5 @@
*
* Replace the run_list at @loc with @new. Merge the left and right ends of
- * the inserted run_list, if necesary.
+ * the inserted run_list, if necessary.
*
* It is up to the caller to serialize access to the run lists @orig and @new.
@@ -274,24 +285,24 @@
BUG_ON (!orig || !new);
+ /* First, merge the left and right ends, if necessary. */
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
if (loc > 0)
left = ntfs_rl_merge (orig + loc - 1, new);
+ /* Allocate some space. We'll need less if the left, right
+ * or both ends were merged. */
res = ntfs_rl_realloc (orig, osize, osize + nsize - left - right);
if (IS_ERR (res))
return res;
- rl_mm (res, loc + nsize - left,
- loc + right + 1,
- osize - loc - right - 1);
-
+ /* Move the tail of Orig out of the way, then copy in New. */
+ rl_mm (res, loc + nsize - left, loc + right + 1,
+ osize - loc - right - 1);
rl_mc (res, loc, new, left, nsize - left);
- if (!right) {
- if (res[loc+nsize-left].lcn == LCN_ENOENT)
- res[loc+nsize-left].vcn = res[loc+nsize-left-1].vcn +
- res[loc+nsize-left-1].length;
- }
-
+ /* We may have changed the length of the file, so fix the end marker */
+ if (res[loc+nsize-left].lcn == LCN_ENOENT)
+ res[loc+nsize-left].vcn = res[loc+nsize-left-1].vcn +
+ res[loc+nsize-left-1].length;
return res;
}
@@ -303,5 +314,5 @@
* @new: The run_list to be inserted.
* @nsize: The number of elements in @new (excluding end marker).
- * @loc: Index of run_list @orig to insert @new before.
+ * @loc: Index of run_list in @orig to split with @new.
*
* Split the run_list at @loc into two and insert @new. No merging of
@@ -322,14 +333,17 @@
BUG_ON (!orig || !new);
+ /* Space required: Orig size + New size + One new hole. */
res = ntfs_rl_realloc (orig, osize, osize + nsize + 1);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + 1 + nsize, loc, osize - loc);
rl_mc (res, loc + 1, new, 0, nsize);
- res[loc].length = res[loc+1].vcn - res[loc].vcn;
- res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
- res[loc+nsize+1].length -= (new[nsize-1].vcn + new[nsize-1].length - new[0].vcn) + res[loc].length;
+ /* Adjust the size of the holes either size of New. */
+ res[loc].length = res[loc+1].vcn - res[loc].vcn;
+ res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
+ res[loc+nsize+1].length = res[loc+nsize+2].vcn - res[loc+nsize+1].vcn;
return res;
@@ -572,5 +586,5 @@
/* Make sure attr exists and is non-resident. */
if (!attr || !attr->non_resident ||
- sle64_to_cpu(attr->lowest_vcn) < (VCN)0) {
+ sle64_to_cpu(attr->_ANR(lowest_vcn)) < (VCN)0) {
ntfs_error(vol->sb, "Invalid arguments.");
return ERR_PTR(-EINVAL);
@@ -578,8 +592,8 @@
#endif
/* Start at vcn = lowest_vcn and lcn 0. */
- vcn = sle64_to_cpu(attr->lowest_vcn);
+ vcn = sle64_to_cpu(attr->_ANR(lowest_vcn));
lcn = 0;
/* Get start of the mapping pairs array. */
- buf = (u8*)attr + le16_to_cpu(attr->mapping_pairs_offset);
+ buf = (u8*)attr + le16_to_cpu(attr->_ANR(mapping_pairs_offset));
attr_end = (u8*)attr + le32_to_cpu(attr->length);
if (unlikely(buf < (u8*)attr || buf > attr_end)) {
@@ -707,5 +721,5 @@
* vcn in the run list - 1, or something has gone badly wrong.
*/
- deltaxcn = sle64_to_cpu(attr->highest_vcn);
+ deltaxcn = sle64_to_cpu(attr->_ANR(highest_vcn));
if (unlikely(deltaxcn && vcn - 1 != deltaxcn)) {
mpa_err:
@@ -715,8 +729,8 @@
}
/* Setup not mapped run_list element if this is the base extent. */
- if (!attr->lowest_vcn) {
+ if (!attr->_ANR(lowest_vcn)) {
VCN max_cluster;
- max_cluster = (sle64_to_cpu(attr->allocated_size) +
+ max_cluster = (sle64_to_cpu(attr->_ANR(allocated_size)) +
vol->cluster_size - 1) >>
vol->cluster_size_bits;
@@ -910,4 +924,5 @@
}
+
/**
* find_attr - find (next) attribute in mft record
@@ -1046,6 +1061,6 @@
register int rc;
- rc = memcmp(val, (u8*)a +le16_to_cpu(a->value_offset),
- min(val_len, le32_to_cpu(a->value_length)));
+ rc = memcmp(val, (u8*)a +le16_to_cpu(a->_ARA(value_offset)),
+ min(val_len, le32_to_cpu(a->_ARA(value_length))));
/*
* If @val collates before the current attribute's
@@ -1054,5 +1069,5 @@
if (!rc) {
register u32 avl;
- avl = le32_to_cpu(a->value_length);
+ avl = le32_to_cpu(a->_ARA(value_length));
if (val_len == avl)
return TRUE;
@@ -1388,7 +1403,7 @@
* have found it!
*/
- if (!val || (!a->non_resident && le32_to_cpu(a->value_length)
+ if (!val || (!a->non_resident && le32_to_cpu(a->_ARA(value_length))
== val_len && !memcmp((u8*)a +
- le16_to_cpu(a->value_offset), val, val_len))) {
+ le16_to_cpu(a->_ARA(value_offset)), val, val_len))) {
ntfs_debug("Done, found.");
return TRUE;
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.h,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.2
diff -U2 -r1.15.6.1 -r1.15.6.2
--- attrib.h 4 Mar 2002 19:04:02 -0000 1.15.6.1
+++ attrib.h 4 Mar 2002 22:42:49 -0000 1.15.6.2
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -87,6 +88,6 @@
{
if (!a->non_resident)
- return (s64)le32_to_cpu(a->value_length);
- return sle64_to_cpu(a->data_size);
+ return (s64)le32_to_cpu(a->_ARA(value_length));
+ return sle64_to_cpu(a->_ANR(data_size));
}
Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.32.4.1
retrieving revision 1.32.4.2
diff -U2 -r1.32.4.1 -r1.32.4.2
--- compress.c 4 Mar 2002 19:04:02 -0000 1.32.4.1
+++ compress.c 4 Mar 2002 22:42:49 -0000 1.32.4.2
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -453,5 +454,5 @@
struct buffer_head **bhs;
unsigned long offset, index = page->index;
- u32 cb_size = ni->compression_block_size;
+ u32 cb_size = ni->_ICF(compression_block_size);
u64 cb_size_mask = cb_size - 1UL;
VCN vcn;
@@ -468,5 +469,5 @@
/* Number of compression blocks (cbs) in the wanted vcn range. */
unsigned int nr_cbs = (end_vcn - start_vcn) << vol->cluster_size_bits
- >> ni->compression_block_size_bits;
+ >> ni->_ICF(compression_block_size_bits);
/*
* Number of pages required to store the uncompressed data from all
@@ -553,5 +554,5 @@
cur_page = 0;
cur_ofs = 0;
- cb_clusters = ni->compression_block_clusters;
+ cb_clusters = ni->_ICF(compression_block_clusters);
do_next_cb:
nr_cbs--;
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.46.4.1
retrieving revision 1.46.4.2
diff -U2 -r1.46.4.1 -r1.46.4.2
--- dir.c 4 Mar 2002 19:04:02 -0000 1.46.4.1
+++ dir.c 4 Mar 2002 22:42:49 -0000 1.46.4.2
@@ -3,4 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -88,5 +89,5 @@
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
/* The first index entry. */
@@ -97,9 +98,9 @@
* reach the last entry.
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
/* Bounds checks. */
if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto dir_err_out;
@@ -108,5 +109,5 @@
* a pointer to a child node in the B+tree so we just break out.
*/
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/*
@@ -133,5 +134,5 @@
vol->upcase, vol->upcase_len)) {
found_it:
- mref = le64_to_cpu(ie->indexed_file);
+ mref = le64_to_cpu(ie->_IIF(indexed_file));
put_attr_search_ctx(ctx);
unmap_mft_record(READ, dir_ni);
@@ -180,5 +181,5 @@
* presence of a child node.
*/
- if (!(ie->flags & INDEX_ENTRY_NODE)) {
+ if (!(ie->_IEH(flags) & INDEX_ENTRY_NODE)) {
/* No child node, return -ENOENT. */
err = -ENOENT;
@@ -195,5 +196,5 @@
}
/* Get the starting vcn of the index_block holding the child node. */
- vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
+ vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->_IEH(length)) - 8);
ia_mapping = VFS_I(dir_ni)->i_mapping;
descend_into_child_node:
@@ -203,5 +204,5 @@
* disk if necessary.
*/
- page = ntfs_map_page(ia_mapping, vcn << dir_ni->index_vcn_size_bits
+ page = ntfs_map_page(ia_mapping, vcn << dir_ni->_IDM(index_vcn_size_bits)
>> PAGE_CACHE_SHIFT);
if (IS_ERR(page)) {
@@ -213,5 +214,5 @@
fast_descend_into_child_node:
/* Get to the index allocation block. */
- ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << dir_ni->index_vcn_size_bits) &
+ ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << dir_ni->_IDM(index_vcn_size_bits)) &
~PAGE_CACHE_MASK));
/* Bounds checks. */
@@ -235,5 +236,5 @@
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
- dir_ni->index_block_size) {
+ dir_ni->_IDM(index_block_size)) {
ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
"0x%Lx has a size (%u) differing from the "
@@ -243,9 +244,9 @@
(unsigned long long)dir_ni->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
- dir_ni->index_block_size);
+ dir_ni->_IDM(index_block_size));
err = -EIO;
goto unm_unm_err_out;
}
- index_end = (u8*)ia + dir_ni->index_block_size;
+ index_end = (u8*)ia + dir_ni->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
@@ -258,5 +259,5 @@
}
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
- if (index_end > (u8*)ia + dir_ni->index_block_size) {
+ if (index_end > (u8*)ia + dir_ni->_IDM(index_block_size)) {
ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
"inode 0x%Lx exceeds maximum size.",
@@ -274,9 +275,9 @@
* reach the last entry.
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
/* Bounds check. */
if ((u8*)ie < (u8*)ia || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end) {
ntfs_error(sb, "Index entry out of bounds in "
@@ -290,5 +291,5 @@
* a pointer to a child node in the B+tree so we just break out.
*/
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/*
@@ -315,5 +316,5 @@
vol->upcase, vol->upcase_len)) {
found_it2:
- mref = le64_to_cpu(ie->indexed_file);
+ mref = le64_to_cpu(ie->_IIF(indexed_file));
ntfs_unmap_page(page);
put_attr_search_ctx(ctx);
@@ -363,5 +364,5 @@
* the presence of a child node.
*/
- if (ie->flags & INDEX_ENTRY_NODE) {
+ if (ie->_IEH(flags) & INDEX_ENTRY_NODE) {
if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
ntfs_error(sb, "Index entry with child node found in "
@@ -373,5 +374,5 @@
/* Child node present, descend into it. */
old_vcn = vcn;
- vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
+ vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->_IEH(length)) - 8);
if (vcn >= 0) {
/* If vcn is in the same page cache page as old_vcn we
@@ -449,5 +450,5 @@
filp->f_pos = (u8*)ie - (u8*)iu.ia +
(sle64_to_cpu(iu.ia->index_block_vcn) <<
- ndir->index_vcn_size_bits) +
+ ndir->_IDM(index_vcn_size_bits)) +
vol->mft_record_size;
else /* if (index_type == INDEX_TYPE_ROOT) */
@@ -466,9 +467,9 @@
}
}
- if (MREF_LE(ie->indexed_file) == FILE_root) {
+ if (MREF_LE(ie->_IIF(indexed_file)) == FILE_root) {
ntfs_debug("Skipping root directory self reference entry.");
return 0;
}
- if (MREF_LE(ie->indexed_file) < FILE_first_user &&
+ if (MREF_LE(ie->_IIF(indexed_file)) < FILE_first_user &&
RHideSystemFiles(readdir_opts)) {
ntfs_debug("Skipping system file.");
@@ -489,8 +490,8 @@
ntfs_debug("Calling filldir for %s with len %i, f_pos 0x%Lx, inode "
"0x%Lx, DT_%s.", name, name_len, filp->f_pos,
- (unsigned long long)MREF_LE(ie->indexed_file),
+ (unsigned long long)MREF_LE(ie->_IIF(indexed_file)),
dt_type == DT_DIR ? "DIR" : "REG");
return filldir(dirent, name, name_len, filp->f_pos,
- (unsigned long)MREF_LE(ie->indexed_file), dt_type);
+ (unsigned long)MREF_LE(ie->_IIF(indexed_file)), dt_type);
}
@@ -585,5 +586,5 @@
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
/* The first index entry. */
@@ -595,14 +596,14 @@
* or signals an error (both covered by the rc test).
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
ntfs_debug("In index root, offset 0x%x.", (u8*)ie - (u8*)ir);
/* Bounds checks. */
if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto dir_err_out;
/* The last entry cannot contain a name. */
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/* Skip index root entry if continuing previous readdir. */
@@ -643,5 +644,5 @@
goto kf_unm_err_out;
}
- bmp = (u8*)ctx->attr + le16_to_cpu(ctx->attr->value_offset);
+ bmp = (u8*)ctx->attr + le16_to_cpu(ctx->attr->_ARA(value_offset));
}
/* Get the offset into the index allocation attribute. */
@@ -649,9 +650,9 @@
ia_mapping = vdir->i_mapping;
/* If the index block is not in use find the next one that is. */
- bmp_pos = ia_pos >> ndir->index_block_size_bits;
+ bmp_pos = ia_pos >> ndir->_IDM(index_block_size_bits);
page = NULL;
kaddr = NULL;
prev_ia_pos = -1LL;
- if (bmp_pos >> 3 >= ndir->bmp_size) {
+ if (bmp_pos >> 3 >= ndir->_IDM(bmp_size)) {
ntfs_error(sb, "Current index allocation position exceeds "
"index bitmap size.");
@@ -662,7 +663,7 @@
bmp_pos++;
/* If we have reached the end of the bitmap, we are done. */
- if (bmp_pos >> 3 >= ndir->bmp_size)
+ if (bmp_pos >> 3 >= ndir->_IDM(bmp_size))
goto EOD;
- ia_pos = (s64)bmp_pos << ndir->index_block_size_bits;
+ ia_pos = (s64)bmp_pos << ndir->_IDM(index_block_size_bits);
}
ntfs_debug("Handling index buffer 0x%x.", bmp_pos);
@@ -683,5 +684,5 @@
/* Get the current index buffer. */
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
- ~(s64)(ndir->index_block_size - 1)));
+ ~(s64)(ndir->_IDM(index_block_size) - 1)));
/* Bounds checks. */
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
@@ -693,6 +694,6 @@
}
if (sle64_to_cpu(ia->index_block_vcn) != (ia_pos &
- ~(s64)(ndir->index_block_size - 1)) >>
- ndir->index_vcn_size_bits) {
+ ~(s64)(ndir->_IDM(index_block_size) - 1)) >>
+ ndir->_IDM(index_vcn_size_bits)) {
ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
"different from expected VCN (0x%Lx). "
@@ -700,5 +701,5 @@
"bug. ",
(long long)sle64_to_cpu(ia->index_block_vcn),
- (long long)ia_pos >> ndir->index_vcn_size_bits,
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -706,17 +707,17 @@
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
- ndir->index_block_size) {
+ ndir->_IDM(index_block_size)) {
ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
"0x%Lx has a size (%u) differing from the "
"directory specified size (%u). Directory "
"inode is corrupt or driver bug.",
- (long long)ia_pos >> ndir->index_vcn_size_bits,
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
- ndir->index_block_size);
+ ndir->_IDM(index_block_size));
err = -EIO;
goto unm_dir_err_out;
}
- index_end = (u8*)ia + ndir->index_block_size;
+ index_end = (u8*)ia + ndir->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
@@ -724,15 +725,15 @@
"Cannot access! This is probably a bug in the "
"driver.", (long long)ia_pos >>
- ndir->index_vcn_size_bits,
+ ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
goto unm_dir_err_out;
}
- ia_start = ia_pos & ~(s64)(ndir->index_block_size - 1);
+ ia_start = ia_pos & ~(s64)(ndir->_IDM(index_block_size) - 1);
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
- if (index_end > (u8*)ia + ndir->index_block_size) {
+ if (index_end > (u8*)ia + ndir->_IDM(index_block_size)) {
ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
"inode 0x%Lx exceeds maximum size.",
- (long long)ia_pos >> ndir->index_vcn_size_bits,
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -747,5 +748,5 @@
* or signals an error (both covered by the rc test).
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
ntfs_debug("In index allocation, offset 0x%Lx.",
(long long)ia_start + ((u8*)ie - (u8*)ia));
@@ -753,9 +754,9 @@
if ((u8*)ie < (u8*)ia || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto unm_dir_err_out;
/* The last entry cannot contain a name. */
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/* Skip index block entry if continuing previous readdir. */
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.68.4.1
retrieving revision 1.68.4.2
diff -U2 -r1.68.4.1 -r1.68.4.2
--- inode.c 4 Mar 2002 19:04:02 -0000 1.68.4.1
+++ inode.c 4 Mar 2002 22:42:49 -0000 1.68.4.2
@@ -84,7 +84,7 @@
ni->attr_list = NULL;
INIT_RUN_LIST(&ni->attr_list_rl);
- INIT_RUN_LIST(&ni->bmp_rl);
+ INIT_RUN_LIST(&ni->_IDM(bmp_rl));
init_MUTEX(&ni->extent_lock);
- ni->base_ntfs_ino = NULL;
+ ni->_INE(base_ntfs_ino) = NULL;
ni->vol = NTFS_SB(sb);
return;
@@ -164,5 +164,5 @@
return -EIO;
}
- if (!(attr->resident_flags & RESIDENT_ATTR_IS_INDEXED)) {
+ if (!(attr->_ARA(resident_flags) & RESIDENT_ATTR_IS_INDEXED)) {
ntfs_error(ctx->ntfs_ino->vol->sb, "Unindexed file "
"name. You should run chkdsk.");
@@ -170,6 +170,6 @@
}
file_name_attr = (FILE_NAME_ATTR*)((u8*)attr +
- le16_to_cpu(attr->value_offset));
- p2 = (u8*)attr + le32_to_cpu(attr->value_length);
+ le16_to_cpu(attr->_ARA(value_offset)));
+ p2 = (u8*)attr + le32_to_cpu(attr->_ARA(value_length));
if (p2 < (u8*)attr || p2 > p)
goto err_corrupt_attr;
@@ -321,5 +321,5 @@
/* Get the standard information attribute value. */
si = (STANDARD_INFORMATION*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
/* Transfer information from the standard information into vfs_ino. */
@@ -404,6 +404,6 @@
} else /* if (!ctx.attr->non_resident) */ {
if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset) +
- le32_to_cpu(ctx->attr->value_length) >
+ le16_to_cpu(ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(vi->i_sb, "Corrupt attribute list "
@@ -413,6 +413,6 @@
/* Now copy the attribute list. */
memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset),
- le32_to_cpu(ctx->attr->value_length));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(ctx->attr->_ARA(value_length)));
}
}
@@ -460,6 +460,6 @@
}
ir = (INDEX_ROOT*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
- ir_end = (char*)ir + le32_to_cpu(ctx->attr->value_length);
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
+ ir_end = (char*)ir + le32_to_cpu(ctx->attr->_ARA(value_length));
if (ir_end > (char*)ctx->mrec + vol->mft_record_size) {
ntfs_error(vi->i_sb, "$INDEX_ROOT attribute is "
@@ -484,35 +484,35 @@
goto put_unm_err_out;
}
- ni->index_block_size = le32_to_cpu(ir->index_block_size);
- if (ni->index_block_size & (ni->index_block_size - 1)) {
+ ni->_IDM(index_block_size) = le32_to_cpu(ir->index_block_size);
+ if (ni->_IDM(index_block_size) & (ni->_IDM(index_block_size) - 1)) {
ntfs_error(vi->i_sb, "Index block size (%u) is not a "
- "power of two.", ni->index_block_size);
+ "power of two.", ni->_IDM(index_block_size));
goto put_unm_err_out;
}
- if (ni->index_block_size > PAGE_CACHE_SIZE) {
+ if (ni->_IDM(index_block_size) > PAGE_CACHE_SIZE) {
ntfs_error(vi->i_sb, "Index block size (%u) > "
"PAGE_CACHE_SIZE (%ld) is not "
"supported. Sorry.",
- ni->index_block_size,
+ ni->_IDM(index_block_size),
PAGE_CACHE_SIZE);
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- if (ni->index_block_size < NTFS_BLOCK_SIZE) {
+ if (ni->_IDM(index_block_size) < NTFS_BLOCK_SIZE) {
ntfs_error(vi->i_sb, "Index block size (%u) < "
"NTFS_BLOCK_SIZE (%i) is not "
"supported. Sorry.",
- ni->index_block_size, NTFS_BLOCK_SIZE);
+ ni->_IDM(index_block_size), NTFS_BLOCK_SIZE);
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->index_block_size_bits = ffs(ni->index_block_size) - 1;
+ ni->_IDM(index_block_size_bits) = ffs(ni->_IDM(index_block_size)) - 1;
/* Determine the size of a vcn in the directory index. */
- if (vol->cluster_size <= ni->index_block_size) {
- ni->index_vcn_size = vol->cluster_size;
- ni->index_vcn_size_bits = vol->cluster_size_bits;
+ if (vol->cluster_size <= ni->_IDM(index_block_size)) {
+ ni->_IDM(index_vcn_size) = vol->cluster_size;
+ ni->_IDM(index_vcn_size_bits) = vol->cluster_size_bits;
} else {
- ni->index_vcn_size = vol->sector_size;
- ni->index_vcn_size_bits = vol->sector_size_bits;
+ ni->_IDM(index_vcn_size) = vol->sector_size;
+ ni->_IDM(index_vcn_size_bits) = vol->sector_size_bits;
}
if (!(ir->index.flags & LARGE_INDEX)) {
@@ -546,8 +546,8 @@
goto put_unm_err_out;
}
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
- ni->allocated_size = sle64_to_cpu(ctx->attr->allocated_size);
+ ctx->attr->_ANR(initialized_size));
+ ni->allocated_size = sle64_to_cpu(ctx->attr->_ANR(allocated_size));
/*
* Setup the run list. No need for locking as we have exclusive
@@ -579,19 +579,19 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
- ni->bmp_size = sle64_to_cpu(
- ctx->attr->data_size);
- ni->bmp_initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
- ni->bmp_allocated_size = sle64_to_cpu(
- ctx->attr->allocated_size);
+ ni->_IDM(bmp_size) = sle64_to_cpu(
+ ctx->attr->_ANR(data_size));
+ ni->_IDM(bmp_initialized_size) = sle64_to_cpu(
+ ctx->attr->_ANR(initialized_size));
+ ni->_IDM(bmp_allocated_size) = sle64_to_cpu(
+ ctx->attr->_ANR(allocated_size));
/*
* Setup the run list. No need for locking as we have
* exclusive access to the inode at this time.
*/
- ni->bmp_rl.rl = decompress_mapping_pairs(vol, ctx->attr,
+ ni->_IDM(bmp_rl).rl = decompress_mapping_pairs(vol, ctx->attr,
NULL);
- if (IS_ERR(ni->bmp_rl.rl)) {
- err = PTR_ERR(ni->bmp_rl.rl);
- ni->bmp_rl.rl = NULL;
+ if (IS_ERR(ni->_IDM(bmp_rl).rl)) {
+ err = PTR_ERR(ni->_IDM(bmp_rl).rl);
+ ni->_IDM(bmp_rl).rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -600,13 +600,13 @@
}
} else
- ni->bmp_size = ni->bmp_initialized_size =
- ni->bmp_allocated_size =
- le32_to_cpu(ctx->attr->value_length);
+ ni->_IDM(bmp_size) = ni->_IDM(bmp_initialized_size) =
+ ni->_IDM(bmp_allocated_size) =
+ le32_to_cpu(ctx->attr->_ARA(value_length));
/* Consistency check bitmap size vs. index allocation size. */
- if (ni->bmp_size << 3 < vi->i_size >>
- ni->index_block_size_bits) {
+ if (ni->_IDM(bmp_size) << 3 < vi->i_size >>
+ ni->_IDM(index_block_size_bits)) {
ntfs_error(vi->i_sb, "$I30 bitmap too small (0x%Lx) "
"for index allocation (0x%Lx).",
- (long long)ni->bmp_size << 3,
+ (long long)ni->_IDM(bmp_size) << 3,
vi->i_size);
goto put_unm_err_out;
@@ -676,7 +676,7 @@
goto put_unm_err_out;
}
- ni->compression_block_clusters = 1U <<
- ctx->attr->compression_unit;
- if (ctx->attr->compression_unit != 4) {
+ ni->_ICF(compression_block_clusters) = 1U <<
+ ctx->attr->_ANR(compression_unit);
+ if (ctx->attr->_ANR(compression_unit) != 4) {
ntfs_error(vi->i_sb, "Found "
"nonstandard compression unit "
@@ -685,13 +685,13 @@
"indicate corruption so you "
"should run chkdsk.",
- ctx->attr->compression_unit);
+ ctx->attr->_ANR(compression_unit));
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->compression_block_size = 1U <<
- (ctx->attr->compression_unit +
+ ni->_ICF(compression_block_size) = 1U <<
+ (ctx->attr->_ANR(compression_unit) +
vol->cluster_size_bits);
- ni->compression_block_size_bits = ffs(
- ni->compression_block_size) - 1;
+ ni->_ICF(compression_block_size_bits) = ffs(
+ ni->_ICF(compression_block_size)) - 1;
}
if (ctx->attr->flags & ATTR_IS_ENCRYPTED) {
@@ -723,12 +723,12 @@
}
/* Setup all the sizes. */
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
+ ctx->attr->_ANR(initialized_size));
ni->allocated_size = sle64_to_cpu(
- ctx->attr->allocated_size);
+ ctx->attr->_ANR(allocated_size));
if (NInoCompressed(ni))
- ni->compressed_size = sle64_to_cpu(
- ctx->attr->compressed_size);
+ ni->_ICF(compressed_size) = sle64_to_cpu(
+ ctx->attr->_ANR(compressed_size));
} else { /* Resident attribute. */
/*
@@ -739,5 +739,5 @@
*/
vi->i_size = ni->initialized_size = ni->allocated_size =
- le32_to_cpu(ctx->attr->value_length);
+ le32_to_cpu(ctx->attr->_ARA(value_length));
}
no_data_attr_special_case:
@@ -770,5 +770,5 @@
vi->i_blocks = ni->allocated_size >> 9;
else
- vi->i_blocks = ni->compressed_size >> 9;
+ vi->i_blocks = ni->_ICF(compressed_size) >> 9;
/* Done. */
put_attr_search_ctx(ctx);
@@ -847,6 +847,6 @@
* completion handler for directories.
*/
- ni->index_block_size = vol->mft_record_size;
- ni->index_block_size_bits = vol->mft_record_size_bits;
+ ni->_IDM(index_block_size) = vol->mft_record_size;
+ ni->_IDM(index_block_size_bits) = vol->mft_record_size_bits;
/* Very important! Needed to be able to call map_mft_record*(). */
@@ -950,6 +950,6 @@
} else /* if (!ctx.attr->non_resident) */ {
if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset) +
- le32_to_cpu(ctx->attr->value_length) >
+ le16_to_cpu(ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(sb, "Corrupt attribute list "
@@ -959,6 +959,6 @@
/* Now copy the attribute list. */
memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset),
- le32_to_cpu(ctx->attr->value_length));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(ctx->attr->_ARA(value_length)));
}
/* The attribute list is now setup in memory. */
@@ -1066,14 +1066,14 @@
if (!next_vcn) {
/* Get the last vcn in the $DATA attribute. */
- last_vcn = sle64_to_cpu(attr->allocated_size) >>
+ last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
vol->cluster_size_bits;
/* Fill in the inode size. */
- vi->i_size = sle64_to_cpu(attr->data_size);
+ vi->i_size = sle64_to_cpu(attr->_ANR(data_size));
ni->initialized_size =
- sle64_to_cpu(attr->initialized_size);
+ sle64_to_cpu(attr->_ANR(initialized_size));
ni->allocated_size =
- sle64_to_cpu(attr->allocated_size);
+ sle64_to_cpu(attr->_ANR(allocated_size));
/* Set the number of mft records. */
- vol->nr_mft_records = vi->i_size >>
+ vol->_VMM(nr_mft_records) = vi->i_size >>
vol->mft_record_size_bits;
/*
@@ -1131,5 +1131,5 @@
/* Get the lowest vcn for the next extent. */
- highest_vcn = sle64_to_cpu(attr->highest_vcn);
+ highest_vcn = sle64_to_cpu(attr->_ANR(highest_vcn));
next_vcn = highest_vcn + 1;
@@ -1139,5 +1139,5 @@
/* Avoid endless loops due to corruption. */
- if (next_vcn < sle64_to_cpu(attr->lowest_vcn)) {
+ if (next_vcn < sle64_to_cpu(attr->_ANR(lowest_vcn))) {
ntfs_error(sb, "$MFT has corrupt attribute list "
"attribute. Run chkdsk.");
@@ -1250,6 +1250,6 @@
// FIXME: Handle dirty case for each extent inode!
for (i = 0; i < ni->nr_extents; i++)
- ntfs_destroy_inode(ni->extent_ntfs_inos[i]);
- kfree(ni->extent_ntfs_inos);
+ ntfs_destroy_inode(ni->_INE(extent_ntfs_inos)[i]);
+ kfree(ni->_INE(extent_ntfs_inos));
}
/* Free all alocated memory. */
@@ -1292,7 +1292,7 @@
if (S_ISDIR(vi->i_mode)) {
- write_lock(&ni->bmp_rl.lock);
- ntfs_free(ni->bmp_rl.rl);
- write_unlock(&ni->bmp_rl.lock);
+ write_lock(&ni->_IDM(bmp_rl).lock);
+ ntfs_free(ni->_IDM(bmp_rl).rl);
+ write_unlock(&ni->_IDM(bmp_rl).lock);
}
return;
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/layout.h,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -U2 -r1.10 -r1.10.6.1
--- layout.h 3 Feb 2002 19:31:17 -0000 1.10
+++ layout.h 4 Mar 2002 22:42:49 -0000 1.10.6.1
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -286,5 +287,5 @@
typedef struct {
/*Ofs*/
-/* 0*/ NTFS_RECORD; /* Usually the magic is "FILE". */
+/* 0*/ NTFS_RECORD SN(mnr); /* Usually the magic is "FILE". */
/* 8*/ u64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
@@ -350,4 +351,6 @@
} __attribute__ ((__packed__)) MFT_RECORD;
+#define _MNR(X) SC(mnr,X)
+
/*
* System defined attributes (32-bit). Each attribute type has a corresponding
@@ -603,5 +606,5 @@
/* 23 */ s8 reservedR; /* Reserved/alignment to 8-byte
boundary. */
- } __attribute__ ((__packed__));
+ } SN(ara) __attribute__ ((__packed__));
/* Non-resident attributes. */
struct {
@@ -653,8 +656,11 @@
disk space being used on the disk. */
/* sizeof(compressed attr) = 72*/
- } __attribute__ ((__packed__));
- } __attribute__ ((__packed__));
+ } SN(anr) __attribute__ ((__packed__));
+ } SN(aua) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) ATTR_RECORD;
+#define _ARA(X) SC(aua.ara,X)
+#define _ANR(X) SC(aua.anr,X)
+
typedef ATTR_RECORD ATTR_REC;
@@ -803,9 +809,11 @@
journal is a very fast process, so the user
won't even notice it. */
- };
- };
+ } SN(svs);
+ } SN(sei);
/* sizeof() = 72 bytes (NTFS 3.0) */
} __attribute__ ((__packed__)) STANDARD_INFORMATION;
+#define _SVS(X) SC(sei.svs,X)
+
/*
* Attribute: Attribute list (0x20).
@@ -940,10 +948,10 @@
(EAs), if such are present.*/
/* 3e*/ u16 reserved; /* Reserved for alignment. */
- } __attribute__ ((__packed__));
+ } SN(fea) __attribute__ ((__packed__));
/* 3c*/ u32 reparse_point_tag; /* Type of reparse point,
present only in reparse
points and only if there are
no EAs. */
- } __attribute__ ((__packed__));
+ } SN(fer) __attribute__ ((__packed__));
/* 40*/ u8 file_name_length; /* Length of file name in
(Unicode) characters. */
@@ -952,4 +960,7 @@
} __attribute__ ((__packed__)) FILE_NAME_ATTR;
+#define _FEA(X) SC(fer.fea,X)
+#define _FER(X) SC(fer,X)
+
/*
* GUID structures store globally unique identifiers (GUID). A GUID is a
@@ -989,7 +1000,7 @@
GUID birth_object_id;
GUID domain_id;
- } __attribute__ ((__packed__));
+ } SN(obv) __attribute__ ((__packed__));
u8 extended_info[48];
- } __attribute__ ((__packed__));
+ } SN(oei) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) OBJ_ID_INDEX_DATA;
@@ -1013,9 +1024,11 @@
first created. */
GUID domain_id; /* Reserved, zero. */
- } __attribute__ ((__packed__));
+ } SN(obv) __attribute__ ((__packed__));
u8 extended_info[48];
- } __attribute__ ((__packed__));
+ } SN(oei) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) OBJECT_ID_ATTR;
+#define _OBV(X) SC(oei.obv,X)
+
/*
* The pre-defined IDENTIFIER_AUTHORITIES used as SID_IDENTIFIER_AUTHORITY in
@@ -1155,8 +1168,10 @@
u32 low_part; /* Low 32-bits. */
u16 high_part; /* High 16-bits. */
- } __attribute__ ((__packed__));
+ } SN(sia) __attribute__ ((__packed__));
u8 value[6]; /* Value as individual bytes. */
} __attribute__ ((__packed__)) SID_IDENTIFIER_AUTHORITY;
+#define _SIA(X) SC(sia,X)
+
/*
* The SID structure is a variable-length structure used to uniquely identify
@@ -1423,9 +1438,10 @@
*/
typedef struct {
- ACE_HEADER; /* The ACE header. */
+ ACE_HEADER SN(aah); /* The ACE header. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
SID sid; /* The SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
+#define _AAH(X) SC(aah,X)
/*
@@ -1438,5 +1454,5 @@
typedef struct {
- ACE_HEADER; /* The ACE_HEADER. */
+ ACE_HEADER SN(aah); /* The ACE_HEADER. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
OBJECT_ACE_FLAGS flags; /* Flags describing the object ACE. */
@@ -1687,9 +1703,11 @@
*/
typedef struct {
- SECURITY_DESCRIPTOR_HEADER; /* The security descriptor header. */
+ SECURITY_DESCRIPTOR_HEADER SN(sdh); /* The security descriptor header. */
SECURITY_DESCRIPTOR_RELATIVE sid; /* The self-relative security
descriptor. */
} __attribute__ ((__packed__)) SDS_ENTRY;
+#define _SDH(X) SC(sdh,X)
+
/*
* The index entry key used in the $SII index. The collation type is
@@ -1862,5 +1880,5 @@
*/
typedef struct {
-/* 0*/ NTFS_RECORD; /* Magic is "INDX". */
+/* 0*/ NTFS_RECORD SN(inr); /* Magic is "INDX". */
/* 8*/ s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
@@ -1883,4 +1901,6 @@
} __attribute__ ((__packed__)) INDEX_BLOCK;
+#define _INR(X) SC(inr,X)
+
typedef INDEX_BLOCK INDEX_ALLOCATION;
@@ -1997,6 +2017,6 @@
u16 data_length; /* Data length in bytes. */
u32 reservedV; /* Reserved (zero). */
- } __attribute__ ((__packed__));
- } __attribute__ ((__packed__));
+ } SN(iev) __attribute__ ((__packed__));
+ } SN(iif) __attribute__ ((__packed__));
/* 8*/ u16 length; /* Byte size of this index entry, multiple of
8-bytes. */
@@ -2009,4 +2029,7 @@
} __attribute__ ((__packed__)) INDEX_ENTRY_HEADER;
+#define _IIF(X) SC(ieh.iif,X)
+#define _IEV(X) SC(iif.iev,X)
+
/*
* This is an index entry. A sequence of such entries follows each INDEX_HEADER
@@ -2017,5 +2040,5 @@
*/
typedef struct {
-/* 0*/ INDEX_ENTRY_HEADER; /* The index entry header (see above). */
+/* 0*/ INDEX_ENTRY_HEADER SN(ieh); /* The index entry header (see above). */
/* 16*/ union { /* The key of the indexed attribute. NOTE: Only present
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
@@ -2029,5 +2052,5 @@
object_id of the mft record found in
the data part of the index. */
- REPARSE_INDEX_KEY; /* $R index in FILE_Extend/$Reparse. */
+ REPARSE_INDEX_KEY SN(iri); /* $R index in FILE_Extend/$Reparse. */
SID sid; /* $O index in FILE_Extend/$Quota:
SID of the owner of the user_id. */
@@ -2051,4 +2074,7 @@
// where sizeof(VCN) can be hardcoded as 8 if wanted. */
} __attribute__ ((__packed__)) INDEX_ENTRY;
+
+#define _IEH(X) SC(ieh,X)
+#define _IRI(X) SC(key.iri,X)
/*
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.49.4.1
retrieving revision 1.49.4.2
diff -U2 -r1.49.4.1 -r1.49.4.2
--- mft.c 4 Mar 2002 19:04:02 -0000 1.49.4.1
+++ mft.c 4 Mar 2002 22:42:49 -0000 1.49.4.2
@@ -3,4 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -42,8 +43,8 @@
memset(m, 0, size);
- m->magic = magic_FILE;
+ m->_MNR(magic) = magic_FILE;
/* Aligned to 2-byte boundary. */
- m->usa_ofs = cpu_to_le16((sizeof(MFT_RECORD) + 1) & ~1);
- m->usa_count = cpu_to_le16(size / NTFS_BLOCK_SIZE + 1);
+ m->_MNR(usa_ofs) = cpu_to_le16((sizeof(MFT_RECORD) + 1) & ~1);
+ m->_MNR(usa_count) = cpu_to_le16(size / NTFS_BLOCK_SIZE + 1);
/* Set the update sequence number to 1. */
*(u16*)((char*)m + ((sizeof(MFT_RECORD) + 1) & ~1)) = cpu_to_le16(1);
@@ -52,6 +53,6 @@
m->link_count = cpu_to_le16(0);
/* Aligned to 8-byte boundary. */
- m->attrs_offset = cpu_to_le16((le16_to_cpu(m->usa_ofs) +
- (le16_to_cpu(m->usa_count) << 1) + 7) & ~7);
+ m->attrs_offset = cpu_to_le16((le16_to_cpu(m->_MNR(usa_ofs)) +
+ (le16_to_cpu(m->_MNR(usa_count)) << 1) + 7) & ~7);
m->flags = cpu_to_le16(0);
/*
@@ -616,5 +617,5 @@
down(&base_ni->extent_lock);
if (base_ni->nr_extents > 0) {
- extent_nis = base_ni->extent_ntfs_inos;
+ extent_nis = base_ni->_INE(extent_ntfs_inos);
for (i = 0; i < base_ni->nr_extents; i++) {
if (mft_no != extent_nis[i]->mft_no)
@@ -662,5 +663,5 @@
ni->seq_no = seq_no;
ni->nr_extents = -1;
- ni->base_ntfs_ino = base_ni;
+ ni->_INE(base_ntfs_ino) = base_ni;
/* Now map the record. */
m = map_mft_record(READ, ni);
@@ -692,12 +693,12 @@
goto unm_err_out;
}
- if (base_ni->extent_ntfs_inos) {
- memcpy(tmp, base_ni->extent_ntfs_inos, new_size -
+ if (base_ni->_INE(extent_ntfs_inos)) {
+ memcpy(tmp, base_ni->_INE(extent_ntfs_inos), new_size -
4 * sizeof(ntfs_inode *));
- kfree(base_ni->extent_ntfs_inos);
+ kfree(base_ni->_INE(extent_ntfs_inos));
}
- base_ni->extent_ntfs_inos = tmp;
+ base_ni->_INE(extent_ntfs_inos) = tmp;
}
- base_ni->extent_ntfs_inos[base_ni->nr_extents++] = ni;
+ base_ni->_INE(extent_ntfs_inos)[base_ni->nr_extents++] = ni;
up(&base_ni->extent_lock);
atomic_dec(&base_ni->count);
Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.29.6.1
retrieving revision 1.29.6.2
diff -U2 -r1.29.6.1 -r1.29.6.2
--- ntfs.h 4 Mar 2002 19:04:02 -0000 1.29.6.1
+++ ntfs.h 4 Mar 2002 22:42:49 -0000 1.29.6.2
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -23,9 +24,4 @@
#ifndef _LINUX_NTFS_H
#define _LINUX_NTFS_H
-
-/* Make sure gcc-2.96 or higher is being used. */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-# error The NTFS driver can only be compiled with gcc-2.96 or later.
-#endif
#include <linux/version.h>
Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.77.4.1
retrieving revision 1.77.4.2
diff -U2 -r1.77.4.1 -r1.77.4.2
--- super.c 4 Mar 2002 19:04:02 -0000 1.77.4.1
+++ super.c 4 Mar 2002 22:42:49 -0000 1.77.4.2
@@ -3,5 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
- * Copyright (C) 2001 Richard Russon.
+ * Copyright (C) 2001,2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -630,8 +630,8 @@
return FALSE;
}
- vol->nr_clusters = ll;
- ntfs_debug("vol->nr_clusters = 0x%Lx", (long long)vol->nr_clusters);
+ vol->_VCL(nr_clusters) = ll;
+ ntfs_debug("vol->nr_clusters = 0x%Lx", (long long)vol->_VCL(nr_clusters));
ll = sle64_to_cpu(b->mft_lcn);
- if (ll >= vol->nr_clusters) {
+ if (ll >= vol->_VCL(nr_clusters)) {
ntfs_error(vol->sb, "MFT LCN is beyond end of volume. Weird.");
return FALSE;
@@ -640,5 +640,5 @@
ntfs_debug("vol->mft_lcn = 0x%Lx", (long long)vol->mft_lcn);
ll = sle64_to_cpu(b->mftmirr_lcn);
- if (ll >= vol->nr_clusters) {
+ if (ll >= vol->_VCL(nr_clusters)) {
ntfs_error(vol->sb, "MFTMirr LCN is beyond end of volume. "
"Weird.");
@@ -654,5 +654,5 @@
* this, but I am too lazy to create a function especially for it...
*/
- vol->mft_zone_end = vol->nr_clusters;
+ vol->mft_zone_end = vol->_VCL(nr_clusters);
switch (vol->mft_zone_multiplier) { /* % of volume size in clusters */
case 4:
@@ -865,13 +865,13 @@
if (!next_vcn) {
/* Get the last vcn in the $BITMAP attribute. */
- last_vcn = sle64_to_cpu(attr->allocated_size) >>
+ last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
vol->cluster_size_bits;
- vol->mftbmp_size = sle64_to_cpu(attr->data_size);
+ vol->mftbmp_size = sle64_to_cpu(attr->_ANR(data_size));
vol->mftbmp_initialized_size =
- sle64_to_cpu(attr->initialized_size);
+ sle64_to_cpu(attr->_ANR(initialized_size));
vol->mftbmp_allocated_size =
- sle64_to_cpu(attr->allocated_size);
+ sle64_to_cpu(attr->_ANR(allocated_size));
/* Consistency check. */
- if (vol->mftbmp_size < (vol->nr_mft_records + 7) >> 3) {
+ if (vol->mftbmp_size < (vol->_VMM(nr_mft_records) + 7) >> 3) {
ntfs_error(sb, "$MFT/$BITMAP is too short to "
"contain a complete mft "
@@ -883,5 +883,5 @@
/* Get the lowest vcn for the next extent. */
- highest_vcn = sle64_to_cpu(attr->highest_vcn);
+ highest_vcn = sle64_to_cpu(attr->_ANR(highest_vcn));
next_vcn = highest_vcn + 1;
@@ -891,5 +891,5 @@
/* Avoid endless loops due to corruption. */
- if (next_vcn < sle64_to_cpu(attr->lowest_vcn)) {
+ if (next_vcn < sle64_to_cpu(attr->_ANR(lowest_vcn))) {
ntfs_error(sb, "$MFT/$BITMAP has corrupt attribute "
"list attribute. Run chkdsk.");
@@ -959,5 +959,5 @@
goto bitmap_failed;
}
- if ((vol->nr_lcn_bits + 7) >> 3 > vol->lcnbmp_ino->i_size) {
+ if ((vol->_VCL(nr_lcn_bits) + 7) >> 3 > vol->lcnbmp_ino->i_size) {
iput(vol->lcnbmp_ino);
bitmap_failed:
@@ -996,8 +996,8 @@
}
vi = (VOLUME_INFORMATION*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
/* Some bounds checks. */
if ((u8*)vi < (u8*)ctx->attr || (u8*)vi +
- le32_to_cpu(ctx->attr->value_length) > (u8*)ctx->attr +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) > (u8*)ctx->attr +
le32_to_cpu(ctx->attr->length))
goto err_put_vol;
@@ -1194,5 +1194,5 @@
* multiples of PAGE_CACHE_SIZE.
*/
- max_index = (vol->nr_clusters + 7) >> (3 + PAGE_CACHE_SHIFT);
+ max_index = (vol->_VCL(nr_clusters) + 7) >> (3 + PAGE_CACHE_SHIFT);
/* Use multiples of 4 bytes. */
max_size = PAGE_CACHE_SIZE >> 2;
@@ -1233,5 +1233,5 @@
* page.
*/
- max_size = ((((vol->nr_clusters + 7) >> 3) & ~PAGE_CACHE_MASK)
+ max_size = ((((vol->_VCL(nr_clusters) + 7) >> 3) & ~PAGE_CACHE_MASK)
+ 3) >> 2;
/* If there is a partial page go back and do it. */
@@ -1277,5 +1277,5 @@
* multiples of PAGE_CACHE_SIZE.
*/
- max_index = (vol->nr_mft_records + 7) >> (3 + PAGE_CACHE_SHIFT);
+ max_index = (vol->_VMM(nr_mft_records) + 7) >> (3 + PAGE_CACHE_SHIFT);
/* Use multiples of 4 bytes. */
max_size = PAGE_CACHE_SIZE >> 2;
@@ -1316,10 +1316,10 @@
* page.
*/
- max_size = ((((vol->nr_mft_records + 7) >> 3) &
+ max_size = ((((vol->_VMM(nr_mft_records) + 7) >> 3) &
~PAGE_CACHE_MASK) + 3) >> 2;
/* If there is a partial page go back and do it. */
if (max_size) {
/* Compensate for out of bounds zero bits. */
- if ((i = vol->nr_mft_records & 31))
+ if ((i = vol->_VMM(nr_mft_records) & 31))
nr_free -= (s64)(32 - i);
ntfs_debug("Handling partial page, max_size = 0x%x",
@@ -1368,5 +1368,5 @@
* the total clusters.
*/
- sfs->f_blocks = vol->nr_clusters << vol->cluster_size_bits >>
+ sfs->f_blocks = vol->_VCL(nr_clusters) << vol->cluster_size_bits >>
PAGE_CACHE_SHIFT;
/* Free data blocks in file system in units of f_bsize. */
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/volume.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -U2 -r1.6.4.1 -r1.6.4.2
--- volume.h 4 Mar 2002 19:04:02 -0000 1.6.4.1
+++ volume.h 4 Mar 2002 22:42:49 -0000 1.6.4.2
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -80,5 +81,5 @@
LCN nr_clusters; /* Volume size in clusters. */
LCN nr_lcn_bits; /* Number of bits in lcn bitmap. */
- };
+ } SN(vcl);
LCN mft_lcn; /* Cluster location of mft data. */
LCN mftmirr_lcn; /* Cluster location of copy of mft. */
@@ -95,5 +96,5 @@
s64 nr_mft_records; /* Number of records in the mft. */
s64 nr_mft_bits; /* Number of bits in mft bitmap. */
- };
+ } SN(vmm);
struct address_space mftbmp_mapping; /* Page cache for $MFT/$BITMAP. */
run_list mftbmp_rl; /* Run list for $MFT/$BITMAP. */
@@ -115,4 +116,7 @@
struct nls_table *nls_map;
} ntfs_volume;
+
+#define _VCL(X) SC(vcl,X)
+#define _VMM(X) SC(vmm,X)
#endif /* _LINUX_NTFS_VOLUME_H */
|
|
From: Anton A. <an...@us...> - 2002-03-04 19:56:20
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv21259
Modified Files:
debug.c debug.h
Log Message:
Merge debug.* and minor updates
Index: debug.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/debug.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- debug.c 13 Feb 2002 03:54:13 -0000 1.20
+++ debug.c 4 Mar 2002 19:56:16 -0000 1.21
@@ -133,6 +133,6 @@
}
-/* Dump a run list. */
-void ntfs_debug_dump_runlist(const run_list *rl)
+/* Dump a run list. Caller has to provide synchronisation for @rl. */
+void ntfs_debug_dump_runlist(const run_list_element *rl)
{
int i;
Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/debug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- debug.h 3 Feb 2002 19:31:17 -0000 1.4
+++ debug.h 4 Mar 2002 19:56:16 -0000 1.5
@@ -52,5 +52,5 @@
__ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a)
-extern void ntfs_debug_dump_runlist(const run_list *rl);
+extern void ntfs_debug_dump_runlist(const run_list_element *rl);
#else /* !DEBUG */
|
|
From: Anton A. <an...@us...> - 2002-03-04 19:52:50
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20024
Modified Files:
inode.h
Log Message:
Merge holiday changes
Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- inode.h 25 Feb 2002 04:00:58 -0000 1.16
+++ inode.h 4 Mar 2002 19:52:46 -0000 1.17
@@ -36,5 +36,6 @@
*/
struct _ntfs_inode {
- s64 initialized_size; /* Copy from unnamed $DATA attribute. */
+ s64 initialized_size; /* Copy from $DATA/$INDEX_ALLOCATION. */
+ s64 allocated_size; /* Copy from $DATA/$INDEX_ALLOCATION. */
unsigned long state; /* NTFS specific flags describing this inode.
See fs/ntfs/ntfs.h:ntfs_inode_state_bits. */
@@ -43,14 +44,14 @@
atomic_t count; /* Inode reference count for book keeping. */
ntfs_volume *vol; /* Pointer to the ntfs volume of this inode. */
- run_list *run_list; /* If state has the NI_NonResident bit set,
+ run_list run_list; /* If state has the NI_NonResident bit set,
the run list of the unnamed data attribute
(if a file) or of the index allocation
- attribute (directory). If run_list is NULL,
- the run list has not been read in or has
- been unmapped. If NI_NonResident is clear,
- the unnamed data attribute is resident (file)
- or there is no $I30 index allocation
- attribute (directory). In that case run_list
- is always NULL.*/
+ attribute (directory). If run_list.rl is
+ NULL, the run list has not been read in or
+ has been unmapped. If NI_NonResident is
+ clear, the unnamed data attribute is
+ resident (file) or there is no $I30 index
+ allocation attribute (directory). In that
+ case run_list.rl is always NULL.*/
struct rw_semaphore mrec_lock; /* Lock for serializing access to the
mft record belonging to this inode. */
@@ -70,5 +71,5 @@
u32 attr_list_size; /* Length of attribute list value in bytes. */
u8 *attr_list; /* Attribute list value itself. */
- run_list *attr_list_rl; /* Run list for the attribute list value. */
+ run_list attr_list_rl; /* Run list for the attribute list value. */
union {
struct { /* It is a directory or $MFT. */
@@ -79,15 +80,18 @@
u8 index_vcn_size_bits; /* Log2 of the above. */
s64 bmp_size; /* Size of the $I30 bitmap. */
- run_list *bmp_rl; /* Run list for the $I30 bitmap
+ s64 bmp_initialized_size; /* Copy from $I30 bitmap. */
+ s64 bmp_allocated_size; /* Copy from $I30 bitmap. */
+ run_list bmp_rl; /* Run list for the $I30 bitmap
if it is non-resident. */
} SN(idm);
struct { /* It is a compressed file. */
- u32 compression_block_size; /* Size of a compression
- block (cb). */
+ u32 compression_block_size; /* Size of a compression
+ block (cb). */
u8 compression_block_size_bits; /* Log2 of the size of
a cb. */
- u8 compression_block_clusters; /* Number of clusters
- per compression
- block. */
+ u8 compression_block_clusters; /* Number of clusters
+ per compression
+ block. */
+ s64 compressed_size; /* Copy from $DATA. */
} SN(icf);
} SN(idc);
|
|
From: Anton A. <ai...@ca...> - 2002-03-04 19:38:19
|
Hi Jeff! At 19:16 04/03/02, Jeff Garzik wrote: >Anton Altaparmakov wrote: > > + - Change all occurences of integer long long printf formatting > to hex > > + as printk() will not support long long integer format if/when the > > + div64 patch goes into the kernel. > >IMO we have too many u64-on-ia32 cases unrelated to 64-bit division, for >LL printk support to ever go away... I think so too and I am opposed to the current div64 patch (for other reasons not just the printk limitation) but hozer and some others seem to like it so I thought better safe than sorry. (-; Anton -- "I've not lost my mind. It's backed up on tape somewhere." - Unknown -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS Maintainer / WWW: http://linux-ntfs.sf.net/ ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/ |
|
From: Anton A. <an...@us...> - 2002-03-04 19:29:25
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng
In directory usw-pr-cvs1:/tmp/cvs-serv11103
Modified Files:
ChangeLog
Log Message:
Merge ChangeLog from my holiday work.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -U2 -r1.69 -r1.70
--- ChangeLog 4 Mar 2002 14:32:42 -0000 1.69
+++ ChangeLog 4 Mar 2002 19:29:19 -0000 1.70
@@ -1,48 +1,43 @@
ToDo:
- - Audit for initialized_size vs data_size (i.e. i_size) in whole driver.
+ - Audit for allocated_size vs initialized_size vs data_size (i.e.
+ i_size) in whole driver.
Need to enforce limits and zeroes need to be written when overflow is
- detected.
- - Cleanup read_inode in that it can never see non-lowest_vcn 0 extents
- due to the nature of lookup_attr() and how we support attribute lists.
+ detected. We CANNOT use block_read_full_page() at all anywhere! This
+ is because initialized_size can lie within a block and ntfs_get_block
+ has no way to tell block_read_full_page about it. So our readpage
+ functions need to clone block_read_full_page and modify it to cope
+ with the significance of the different attribute sizes.
+ Still need to go through:
+ aops.c, attrib.c, compress.c, dir.c, mft.c
- Find and fix bugs.
+ - W.r.t. s_maxbytes still need to be careful on reading/truncating as
+ there are dragons lurking in the details, e.g. read_inode() currently
+ does no checks for file size wrt s_maxbytes. So what happens when a
+ user open()s a file with i_size > s_maxbytes? Should read_inode()
+ truncate the visible i_size? Will the user just get -E2BIG (or
+ whatever) on open()? Or will (s)he be able to open() but lseek() and
+ read() will fail when s_maxbytes is reached? -> Investigate this!
- Perhaps don't bother getting the run list in ntfs_read_inode() at
all. But we do have to find the data/index root attribute to get the
inode size so we might want to decompress the mapping pairs of the
- first extent in there anyway.
- - Implement a mount time switch allowing choice between different
- directory entry namespaces and modify readdir() accordingly. We want
- to have three options: a) short file names only, b) long file names
- only [DEFAULT], and c) all file names [this one with a fat mount
- time warning that it will confuse Linux!].
+ first extent in there anyway. -> Ponder this. Directory listings
+ would have significant speedups but the first access to each file/dir
+ would have a small speed penalty.
- Implement/allow non-resident index bitmaps in ntfs_readdir().
- - Add preemt_{enable,disable,enable_no_resched} in compession engine
- for 2.5.4-pre6.
- - Replace size determination in read_super() with
- sb->s_bdev->bd_inode->i_size (in bytes).
- - When upgrading to 2.5.4-pre2, set s_maxbytes to MAX_LFS_FILESIZE, but
- still need to be careful on reading/truncating as there are still
- dragons.
- - Also again for 2.5.4-pre2, move to using ->get_sb() and replace
- read_super() with fill super. fill_super should return 0 on success
- and -errno on error (usually -EINVAL). The code for get_sb and new
- fs type declaration stuff is:
-
-static struct super_block *ntfs_get_sb(struct file_system_type *fs_type,
- int flags, char *dev_name, void *data)
-{
- return get_sb_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);
-}
-
-static struct file_system_type ntfs_fs_type = {
- owner: THIS_MODULE,
- name: "ntfs",
- get_sb: ntfs_get_sb,
- fs_flags: FS_REQUIRES_DEV,
-};
+ - vcn_to_lcn() should somehow return the correct pointer within the
+ ->run_list so we can get at the lcns for the following vcns, this is
+ strictly a speed optimization. Obviously need to keep the ->run_list
+ locked or RACE. load_attribute_list() which we call without any locks
+ held already performs such an optimization but that is no longer
+ possible when using the spinlock on the run lists as this would sleep
+ in between. Either need different type of optimization as above or
+ need to change the read/write spinlock to a read/write semaphore.
+ - Check for lowest_vcn != 0 in ntfs_read_inode() and mark the inode as
+ bad if found.
tng-0.0.8 - Work in progress.
- Replace bdevname(sb->s_dev) with sb->s_id.
- - Remove now superfluous new line characters in all callers of
+ - Remove now superfluous new-line characters in all callers of
ntfs_debug().
- Apply kludge in ntfs_read_inode(), setting i_nlink to 1 for
@@ -51,4 +46,66 @@
- Further run list merging work. (Richard Russon)
- Backwards compatibility for gcc-2.95. (Richard Russon)
+ - Update to kernel 2.5.5-pre1 and rediff the now tiny patch.
+ - Convert to new file system declaration using ->ntfs_get_sb() and
+ replacing ntfs_read_super() with ntfs_fill_super().
+ - Set s_maxbytes to MAX_LFS_FILESIZE to avoid page cache page index
+ overflow on 32-bit architectures.
+ - Cleanup upcase loading code to use ntfs_(un)map_page().
+ - Disable/reenable preemtion in critical sections of compession engine.
+ - Replace device size determination in ntfs_fill_super() with
+ sb->s_bdev->bd_inode->i_size (in bytes) and remove now superfluous
+ function super.c::get_nr_blocks().
+ - Implement a mount time option (show_inodes) allowing choice of which
+ types of inode names readdir() returns and modify ntfs_filldir()
+ accordingly. There are several parameters to show_inodes:
+ system: system files
+ win32: long file names (including POSIX file names) [DEFAULT]
+ long: same as win32
+ dos: short file names only (excluding POSIX file names)
+ short: same as dos
+ posix: same as both win32 and dos
+ all: all file names
+ Note that the options are additive, i.e. specifying:
+ -o show_inodes=system,show_inodes=win32,show_inodes=dos
+ is the same as specifying:
+ -o show_inodes=all
+ Note that the "posix" and "all" options will show all directory
+ names, BUT the link count on each directory inode entry is set to 1,
+ due to Linux not supporting directory hard links. This may well
+ confuse some userspace applications, since the directory names will
+ have the same inode numbers. Thus it is NOT advisable to use the
+ "posix" or "all" options. We provide them only for completeness sake.
+ - Add copies of allocated_size, initialized_size, and compressed_size to
+ the ntfs inode structure and set them up in
+ inode.c::ntfs_read_inode(). These reflect the unnamed data attribute
+ for files and the index allocation attribute for directories.
+ - Add copies of allocated_size and initialized_size to ntfs inode for
+ $BITMAP attribute of large directories and set them up in
+ inode.c::ntfs_read_inode().
+ - Add copies of allocated_size and initialized_size to ntfs volume for
+ $BITMAP attribute of $MFT and set them up in
+ super.c::load_system_files().
+ - Parse deprecated ntfs driver options (iocharset, show_sys_files,
+ posix, and utf8) and tell user what the new options to use are. Note
+ we still do support them but they will be removed with kernel 2.7.x.
+ - Change all occurences of integer long long printf formatting to hex
+ as printk() will not support long long integer format if/when the
+ div64 patch goes into the kernel.
+ - Make slab caches have stable names and change the names to what they
+ were intended to be. These changes are required/made possible by the
+ new slab cache name handling which removes the length limitation by
+ requiring the caller of kmem_cache_create() to supply a stable name
+ which is then referenced but not copied.
+ - Rename run_list structure to run_list_element and create a new
+ run_list structure containing a pointer to a run_list_element
+ structure and a read/write spinlock. Adapt all usesrs of run lists
+ to new scheme and take and release the lock as needed. This fixes a
+ nasty race as the run_list changes even when inodes are locked for
+ reading and even when the inode isn't locked at all, so we really
+ needed the serialization.
+ - Cleanup read_inode() removing all code checking for lowest_vcn != 0.
+ This can never happen due to the nature of lookup_attr() and how we
+ support attribute lists. If it did happen it would imply the inode
+ being corrupt.
tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only!
|
|
From: Jeff G. <jg...@ma...> - 2002-03-04 19:16:14
|
Anton Altaparmakov wrote: > + - Change all occurences of integer long long printf formatting to hex > + as printk() will not support long long integer format if/when the > + div64 patch goes into the kernel. IMO we have too many u64-on-ia32 cases unrelated to 64-bit division, for LL printk support to ever go away... -- Jeff Garzik | Building 1024 | MandrakeSoft | Choose life. |
|
From: Anton A. <an...@us...> - 2002-03-04 19:04:09
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng
In directory usw-pr-cvs1:/tmp/cvs-serv4205
Modified Files:
Tag: pre-95
ChangeLog
Log Message:
vacation is over. here is the results. read the changelog for details.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.67.4.1
diff -U2 -r1.67 -r1.67.4.1
--- ChangeLog 14 Feb 2002 06:07:33 -0000 1.67
+++ ChangeLog 4 Mar 2002 19:04:02 -0000 1.67.4.1
@@ -1,50 +1,103 @@
ToDo:
- - Audit for initialized_size vs data_size (i.e. i_size) in whole driver.
+ - Audit for allocated_size vs initialized_size vs data_size (i.e.
+ i_size) in whole driver.
Need to enforce limits and zeroes need to be written when overflow is
- detected.
+ detected. We CANNOT use block_read_full_page() at all anywhere! This
+ is because initialized_size can lie within a block and ntfs_get_block
+ has no way to tell block_read_full_page about it. So our readpage
+ functions need to clone block_read_full_page and modify it to cope
+ with the significance of the different attribute sizes.
+ Still need to go through:
+ aops.c, attrib.c, compress.c, dir.c, mft.c
- Find and fix bugs.
+ - W.r.t. s_maxbytes still need to be careful on reading/truncating as
+ there are dragons lurking in the details, e.g. read_inode() currently
+ does no checks for file size wrt s_maxbytes. So what happens when a
+ user open()s a file with i_size > s_maxbytes? Should read_inode()
+ truncate the visible i_size? Will the user just get -E2BIG (or
+ whatever) on open()? Or will (s)he be able to open() but lseek() and
+ read() will fail when s_maxbytes is reached? -> Investigate this!
- Perhaps don't bother getting the run list in ntfs_read_inode() at
all. But we do have to find the data/index root attribute to get the
inode size so we might want to decompress the mapping pairs of the
- first extent in there anyway.
- - Implement a mount time switch allowing choice between different
- directory entry namespaces and modify readdir() accordingly. We want
- to have three options: a) short file names only, b) long file names
- only [DEFAULT], and c) all file names [this one with a fat mount
- time warning that it will confuse Linux!].
+ first extent in there anyway. -> Ponder this. Directory listings
+ would have significant speedups but the first access to each file/dir
+ would have a small speed penalty.
- Implement/allow non-resident index bitmaps in ntfs_readdir().
- - Add preemt_{enable,disable,enable_no_resched} in compession engine
- for 2.5.4-pre6.
- - Replace size determination in read_super() with
- sb->s_bdev->bd_inode->i_size (in bytes).
- - When upgrading to 2.5.4-pre2, set s_maxbytes to MAX_LFS_FILESIZE, but
- still need to be careful on reading/truncating as there are still
- dragons.
- - Also again for 2.5.4-pre2, move to using ->get_sb() and replace
- read_super() with fill super. fill_super should return 0 on success
- and -errno on error (usually -EINVAL). The code for get_sb and new
- fs type declaration stuff is:
-
-static struct super_block *ntfs_get_sb(struct file_system_type *fs_type,
- int flags, char *dev_name, void *data)
-{
- return get_sb_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);
-}
-
-static struct file_system_type ntfs_fs_type = {
- owner: THIS_MODULE,
- name: "ntfs",
- get_sb: ntfs_get_sb,
- fs_flags: FS_REQUIRES_DEV,
-};
+ - vcn_to_lcn() should somehow return the correct pointer within the
+ ->run_list so we can get at the lcns for the following vcns, this is
+ strictly a speed optimization. Obviously need to keep the ->run_list
+ locked or RACE. load_attribute_list() which we call without any locks
+ held already performs such an optimization but that is no longer
+ possible when using the spinlock on the run lists as this would sleep
+ in between. Either need different type of optimization as above or
+ need to change the read/write spinlock to a read/write semaphore.
tng-0.0.8 - Work in progress.
- Replace bdevname(sb->s_dev) with sb->s_id.
- - Remove now superfluous new line characters in all callers of
+ - Remove now superfluous new-line characters in all callers of
ntfs_debug().
- Apply kludge in ntfs_read_inode(), setting i_nlink to 1 for
directories. Without this the "find" utility gets very upset which is
fair enough as Linux/Unix do not support directory hard links.
+ - Update to kernel 2.5.5-pre1 and rediff the now tiny patch.
+ - Convert to new file system declaration using ->ntfs_get_sb() and
+ replacing ntfs_read_super() with ntfs_fill_super().
+ - Set s_maxbytes to MAX_LFS_FILESIZE to avoid page cache page index
+ overflow on 32-bit architectures.
+ - Cleanup upcase loading code to use ntfs_(un)map_page().
+ - Disable/reenable preemtion in critical sections of compession engine.
+ - Replace device size determination in ntfs_fill_super() with
+ sb->s_bdev->bd_inode->i_size (in bytes) and remove now superfluous
+ function super.c::get_nr_blocks().
+ - Implement a mount time option (show_inodes) allowing choice of which
+ types of inode names readdir() returns and modify ntfs_filldir()
+ accordingly. There are several parameters to show_inodes:
+ system: system files
+ win32: long file names (including POSIX file names) [DEFAULT]
+ long: same as win32
+ dos: short file names only (excluding POSIX file names)
+ short: same as dos
+ posix: same as both win32 and dos
+ all: all file names
+ Note that the options are additive, i.e. specifying:
+ -o show_inodes=system,show_inodes=win32,show_inodes=dos
+ is the same as specifying:
+ -o show_inodes=all
+ Note that the "posix" and "all" options will show all directory
+ names, BUT the link count on each directory inode entry is set to 1,
+ due to Linux not supporting directory hard links. This may well
+ confuse some userspace applications, since the directory names will
+ have the same inode numbers. Thus it is NOT advisable to use the
+ "posix" or "all" options. We provide them only for completeness sake.
+ - Add copies of allocated_size, initialized_size, and compressed_size to
+ the ntfs inode structure and set them up in
+ inode.c::ntfs_read_inode(). These reflect the unnamed data attribute
+ for files and the index allocation attribute for directories.
+ - Add copies of allocated_size and initialized_size to ntfs inode for
+ $BITMAP attribute of large directories and set them up in
+ inode.c::ntfs_read_inode().
+ - Add copies of allocated_size and initialized_size to ntfs volume for
+ $BITMAP attribute of $MFT and set them up in
+ super.c::load_system_files().
+ - Parse deprecated ntfs driver options (iocharset, show_sys_files,
+ posix, and utf8) and tell user what the new options to use are. Note
+ we still do support them but they will be removed with kernel 2.7.x.
+ - Change all occurences of integer long long printf formatting to hex
+ as printk() will not support long long integer format if/when the
+ div64 patch goes into the kernel.
+ - Make slab caches have stable names and change the names to what they
+ were intended to be. These changes are required/made possible by the
+ new slab cache name handling which removes the length limitation by
+ requiring the caller of kmem_cache_create() to supply a stable name
+ which is then referenced but not copied.
+ - Rename run_list structure to run_list_element and create a new
+ run_list structure containing a pointer to a run_list_element
+ structure and a read/write spinlock. Adapt all usesrs of run lists
+ to new scheme and take and release the lock as needed. This fixes a
+ nasty race as the run_list changes even when inodes are locked for
+ reading and even when the inode isn't locked at all, so we really
+ needed the serialization.
tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only!
|
|
From: Anton A. <an...@us...> - 2002-03-04 19:04:09
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv4205/linux/fs/ntfs
Modified Files:
Tag: pre-95
aops.c attrib.c attrib.h compress.c debug.c debug.h dir.c
inode.c inode.h mft.c ntfs.h super.c types.h volume.h
Log Message:
vacation is over. here is the results. read the changelog for details.
Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.53
retrieving revision 1.53.4.1
diff -U2 -r1.53 -r1.53.4.1
--- aops.c 14 Feb 2002 06:07:14 -0000 1.53
+++ aops.c 4 Mar 2002 19:04:02 -0000 1.53.4.1
@@ -100,5 +100,7 @@
/* Convert the vcn to the corresponding logical cluster number (lcn). */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
/* Successful remap. */
if (lcn >= 0) {
@@ -295,5 +297,7 @@
return 0;
}
- lcn = vcn_to_lcn(vol->mftbmp_rl, vcn);
+ read_lock(&vol->mftbmp_rl.lock);
+ lcn = vcn_to_lcn(vol->mftbmp_rl.rl, vcn);
+ read_unlock(&vol->mftbmp_rl.lock);
ntfs_debug("lcn = 0x%Lx.", (long long)lcn);
if (lcn < 0LL) {
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.65
retrieving revision 1.65.4.1
diff -U2 -r1.65 -r1.65.4.1
--- attrib.c 18 Feb 2002 01:53:00 -0000 1.65
+++ attrib.c 4 Mar 2002 19:04:02 -0000 1.65.4.1
@@ -27,6 +27,8 @@
/**
* rl_mm - run_list memmove
+ *
+ * It is up to the caller to serialize access to the run list @base.
*/
-static inline void rl_mm (run_list *base, int dst, int src, int size)
+static inline void rl_mm(run_list_element *base, int dst, int src, int size)
{
if ((dst != src) && (size > 0))
@@ -36,7 +38,10 @@
/**
* rl_mc - run_list memory copy
+ *
+ * It is up to the caller to serialize access to the run lists @dstbase and
+ * @srcbase.
*/
-static inline void rl_mc (run_list *dstbase, int dst, run_list *srcbase,
- int src, int size)
+static inline void rl_mc(run_list_element *dstbase, int dst,
+ run_list_element *srcbase, int src, int size)
{
if (size > 0)
@@ -54,4 +59,6 @@
* memory, this function returns and entire page of memory.
*
+ * It is up to the caller to serialize access to the run list @orig.
+ *
* N.B. If the new allocation doesn't require a different number of pages in
* memory, the function will return the original pointer.
@@ -62,7 +69,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_realloc (run_list *orig, int old, int new)
+static inline run_list_element *ntfs_rl_realloc(run_list_element *orig,
+ int old, int new)
{
- run_list *nrl;
+ run_list_element *nrl;
old = PAGE_ALIGN (old * sizeof (run_list));
@@ -90,8 +98,10 @@
* must be adjacent.
*
+ * It is up to the caller to serialize access to the run lists @one and @two.
+ *
* Return: TRUE Success, the run_lists were merged
* FALSE Failure, the run_lists were not merged
*/
-static inline BOOL ntfs_rl_merge (run_list *one, run_list *two)
+static inline BOOL ntfs_rl_merge(run_list_element *one, run_list_element *two)
{
BUG_ON (!one || !two);
@@ -120,4 +130,6 @@
* appended run_list.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -125,8 +137,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_append (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_append(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL right;
@@ -164,4 +176,6 @@
* inserted run_list.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -169,8 +183,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_insert (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_insert(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL left = FALSE;
BOOL disc = FALSE; /* Discontinuity */
@@ -244,4 +258,6 @@
* the inserted run_list, if necesary.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -249,8 +265,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_replace (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_replace(run_list_element *orig,
+ int osize, run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BOOL left = FALSE;
BOOL right;
@@ -292,4 +308,6 @@
* run_lists is necessary. Adjust the size of the holes either side.
*
+ * It is up to the caller to serialize access to the run lists @orig and @new.
+ *
* Return: Pointer, The new, combined, run_list
*
@@ -297,8 +315,8 @@
* -EINVAL, Invalid parameters were passed in.
*/
-static inline run_list * ntfs_rl_split (run_list *orig, int osize,
- run_list *new, int nsize, int loc)
+static inline run_list_element *ntfs_rl_split(run_list_element *orig, int osize,
+ run_list_element *new, int nsize, int loc)
{
- run_list *res;
+ run_list_element *res;
BUG_ON (!orig || !new);
@@ -327,4 +345,6 @@
* or completely within a hole in @drl.
*
+ * It is up to the caller to serialize access to the run lists @drl and @srl.
+ *
* Merging of run lists is necessary in two cases:
* 1. When attribute lists are used and a further extent is being mapped.
@@ -347,7 +367,7 @@
* -ERANGE, The run_lists overlap and cannot be merged.
*/
-run_list * merge_run_lists (run_list *drl, run_list *srl)
+run_list_element *merge_run_lists(run_list_element *drl, run_list_element *srl)
{
- run_list *nrl; /* New run list. */
+ run_list_element *nrl; /* New run list. */
int di, si; /* Current index into @[ds]rl. */
int sstart; /* First index with lcn > LCN_RL_NOT_MAPPED. */
@@ -516,4 +536,6 @@
* longer valid.
*
+ * It is up to the caller to serialize access to the run list @old_rl.
+ *
* Check the return value for error with IS_ERR(ret_val). If this is FALSE,
* the function was successful, the return value is the new run list, and if
@@ -533,12 +555,12 @@
* run list if overlap present and return error).
*/
-run_list *decompress_mapping_pairs(const ntfs_volume *vol,
- const ATTR_RECORD *attr, run_list *old_rl)
+run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+ const ATTR_RECORD *attr, run_list_element *old_rl)
{
VCN vcn; /* Current vcn. */
LCN lcn; /* Current lcn. */
s64 deltaxcn; /* Change in [vl]cn. */
- run_list *rl = NULL; /* The output run_list. */
- run_list *rl2; /* Temporary run_list. */
+ run_list_element *rl = NULL; /* The output run_list. */
+ run_list_element *rl2; /* Temporary run_list. */
u8 *buf; /* Current position in mapping pairs array. */
u8 *attr_end; /* End of attribute. */
@@ -759,5 +781,4 @@
attr_search_context *ctx;
MFT_RECORD *mrec;
- run_list *rl;
const uchar_t *name;
u32 name_len;
@@ -796,7 +817,25 @@
}
- /* Decode the run list. */
- rl = decompress_mapping_pairs(ni->vol, ctx->attr, ni->run_list);
+ /* Lock the run list. */
+ write_lock(&ni->run_list.lock);
+ /* Make sure someone else didn't do the work while we were spinning. */
+ if (likely(vcn_to_lcn(ni->run_list.rl, vcn) <= LCN_RL_NOT_MAPPED)) {
+ run_list_element *rl;
+
+ /* Decode the run list. */
+ rl = decompress_mapping_pairs(ni->vol, ctx->attr,
+ ni->run_list.rl);
+
+ /* Flag any errors or set the run list if successful. */
+ if (unlikely(IS_ERR(rl)))
+ err = PTR_ERR(rl);
+ else
+ ni->run_list.rl = rl;
+ }
+
+ /* Unlock the run list. */
+ write_unlock(&ni->run_list.lock);
+
put_attr_search_ctx(ctx);
@@ -805,12 +844,6 @@
/* If an error occured, return it. */
- if (IS_ERR(rl))
- return PTR_ERR(rl);
-
- /* Everything ok, set the run list. */
- ni->run_list = rl;
-
ntfs_debug("Done.");
- return 0;
+ return err;
unm_err_out:
@@ -828,4 +861,6 @@
* corresponding lcns.
*
+ * It is up to the caller to serialize access to the run list @rl.
+ *
* Since lcns must be >= 0, we use negative return values with special meaning:
*
@@ -838,5 +873,5 @@
* -4 = LCN_EINVAL Input parameter error (if debug enabled).
*/
-LCN vcn_to_lcn(const run_list *rl, const VCN vcn)
+LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn)
{
int i;
@@ -875,5 +910,4 @@
}
-
/**
* find_attr - find (next) attribute in mft record
@@ -1044,7 +1078,10 @@
* Note, @size does not need to be a multiple of the cluster size.
*
+ * It is up to the caller to serialize access to the run list @rl.
+ *
* Return 0 on success or -errno on error.
*/
-int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al, const s64 size)
+int load_attribute_list(ntfs_volume *vol, run_list_element *rl, u8 *al,
+ const s64 size)
{
LCN lcn;
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.h,v
retrieving revision 1.15
retrieving revision 1.15.6.1
diff -U2 -r1.15 -r1.15.6.1
--- attrib.h 10 Feb 2002 02:22:58 -0000 1.15
+++ attrib.h 4 Mar 2002 19:04:02 -0000 1.15.6.1
@@ -66,10 +66,10 @@
} attr_search_context;
-extern run_list *decompress_mapping_pairs(const ntfs_volume *vol,
- const ATTR_RECORD *attr, run_list *run_list);
+extern run_list_element *decompress_mapping_pairs(const ntfs_volume *vol,
+ const ATTR_RECORD *attr, run_list_element *old_rl);
extern int map_run_list(ntfs_inode *ni, VCN vcn);
-extern LCN vcn_to_lcn(const run_list *rl, const VCN vcn);
+extern LCN vcn_to_lcn(const run_list_element *rl, const VCN vcn);
extern BOOL find_attr(const ATTR_TYPES type, const uchar_t *name,
@@ -81,5 +81,5 @@
const u32 val_len, attr_search_context *ctx);
-extern int load_attribute_list(ntfs_volume *vol, run_list *rl, u8 *al,
+extern int load_attribute_list(ntfs_volume *vol, run_list_element *rl, u8 *al,
const s64 size);
Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.32
retrieving revision 1.32.4.1
diff -U2 -r1.32 -r1.32.4.1
--- compress.c 14 Feb 2002 06:07:14 -0000 1.32
+++ compress.c 4 Mar 2002 19:04:02 -0000 1.32.4.1
@@ -118,4 +118,7 @@
* @cb_size: size of compression block @cb_start in bytes (IN)
*
+ * The caller must have disabled preemption. ntfs_decompress() reenables it when
+ * the critical section is finished.
+ *
* This decompresses the compression block @cb_start into the array of
* destination pages @dest_pages starting at index @dest_index into @dest_pages
@@ -135,6 +138,6 @@
* unpredicatbly! You have been warned!
*
- * Note: This function may not sleep until it has finished accessing the
- * compression block @cb_start.
+ * Note to hackers: This function may not sleep until it has finished accessing
+ * the compression block @cb_start as it is a per-CPU buffer.
*/
static int ntfs_decompress(struct page *dest_pages[], int *dest_index,
@@ -185,4 +188,6 @@
err = 0;
return_error:
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
/* Second stage: finalize completed pages. */
for (i = 0; i < nr_completed_pages; i++) {
@@ -564,5 +569,7 @@
}
/* Find lcn of vcn and convert it into blocks. */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
(long long)vcn, (long long)lcn);
@@ -623,8 +630,7 @@
* Get the compression buffer corresponding to the current CPU. We must
* not sleep any more until we are finished with the compression buffer.
- * If on a preemptible kernel, disable preemption.
+ * If on a preemptible kernel, now disable preemption.
*/
- // preempt_disable();
- // don't forget preempt_enable(); later!
+ preempt_disable();
cb = ntfs_compression_buffers[smp_processor_id()];
@@ -662,5 +668,6 @@
/* Sparse cb, zero out page range overlapping the cb. */
ntfs_debug("Found sparse compression block.");
- /* We can sleep from now on. */
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
if (cb_max_ofs)
cb_max_page--;
@@ -743,5 +750,7 @@
cur_ofs = cb_max_ofs;
}
- /* We can sleep from now on. Second stage: finalize pages. */
+ /* We can sleep from now on, so we reenable preemption. */
+ preempt_enable();
+ /* Second stage: finalize pages. */
for (; cur2_page < cb_max_page; cur2_page++) {
page = pages[cur2_page];
@@ -770,5 +779,8 @@
cb_max_page, cb_max_ofs, xpage, &xpage_done,
cb_pos, cb_size - (cb_pos - cb));
- /* We can sleep from now on. */
+ /*
+ * We can sleep from now on, preemption already reenabled by
+ * ntfs_decompess.
+ */
if (err) {
ntfs_error(vol->sb, "ntfs_decompress() failed with "
Index: debug.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/debug.c,v
retrieving revision 1.20
retrieving revision 1.20.6.1
diff -U2 -r1.20 -r1.20.6.1
--- debug.c 13 Feb 2002 03:54:13 -0000 1.20
+++ debug.c 4 Mar 2002 19:04:02 -0000 1.20.6.1
@@ -134,5 +134,5 @@
/* Dump a run list. */
-void ntfs_debug_dump_runlist(const run_list *rl)
+void ntfs_debug_dump_runlist(run_list_element *rl)
{
int i;
Index: debug.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/debug.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -U2 -r1.4 -r1.4.8.1
--- debug.h 3 Feb 2002 19:31:17 -0000 1.4
+++ debug.h 4 Mar 2002 19:04:02 -0000 1.4.8.1
@@ -52,5 +52,5 @@
__ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a)
-extern void ntfs_debug_dump_runlist(const run_list *rl);
+extern void ntfs_debug_dump_runlist(run_list_element *rl);
#else /* !DEBUG */
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.46
retrieving revision 1.46.4.1
diff -U2 -r1.46 -r1.46.4.1
--- dir.c 14 Feb 2002 01:08:46 -0000 1.46
+++ dir.c 4 Mar 2002 19:04:02 -0000 1.46.4.1
@@ -81,5 +81,5 @@
ctx)) {
ntfs_error(sb, "Index root attribute missing in directory "
- "inode %Li.",
+ "inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -188,6 +188,6 @@
if (!NInoIndexAllocPresent(dir_ni)) {
ntfs_error(sb, "No index allocation attribute but index entry "
- "requires one. Directory inode %Li is corrupt "
- "or driver bug.",
+ "requires one. Directory inode 0x%Lx is "
+ "corrupt or driver bug.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -218,5 +218,5 @@
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
- "inode %Li or driver bug.",
+ "inode 0x%Lx or driver bug.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -224,7 +224,8 @@
}
if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
- ntfs_error(sb, "Actual VCN (%Li) of index buffer is different "
- "from expected VCN (%Li). Directory inode %Li "
- "is corrupt or driver bug.",
+ ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+ "different from expected VCN (0x%Lx). "
+ "Directory inode 0x%Lx is corrupt or driver "
+ "bug.",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)vcn,
@@ -235,8 +236,8 @@
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
dir_ni->index_block_size) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "has a size (%u) differing from the directory "
- "specified size (%u). Directory inode is "
- "corrupt or driver bug.",
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx has a size (%u) differing from the "
+ "directory specified size (%u). Directory "
+ "inode is corrupt or driver bug.",
(long long)vcn,
(unsigned long long)dir_ni->mft_no,
@@ -248,7 +249,7 @@
index_end = (u8*)ia + dir_ni->index_block_size;
if (index_end > kaddr + PAGE_CACHE_SIZE) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "crosses page boundary. Impossible! Cannot "
- "access! This is probably a bug in the "
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx crosses page boundary. Impossible! "
+ "Cannot access! This is probably a bug in the "
"driver.", (long long)vcn,
(unsigned long long)dir_ni->mft_no);
@@ -258,6 +259,6 @@
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + dir_ni->index_block_size) {
- ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
- "inode %Li exceeds maximum size.",
+ ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+ "inode 0x%Lx exceeds maximum size.",
(long long)vcn,
(unsigned long long)dir_ni->mft_no);
@@ -280,5 +281,5 @@
index_end) {
ntfs_error(sb, "Index entry out of bounds in "
- "directory inode %Li.",
+ "directory inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -365,5 +366,5 @@
if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
ntfs_error(sb, "Index entry with child node found in "
- "a leaf node in directory inode %Li.",
+ "a leaf node in directory inode 0x%Lx.",
(unsigned long long)dir_ni->mft_no);
err = -EIO;
@@ -385,5 +386,5 @@
}
ntfs_error(sb, "Negative child node vcn in directory inode "
- "%Li.", (unsigned long long)dir_ni->mft_no);
+ "0x%Lx.", (unsigned long long)dir_ni->mft_no);
err = -EIO;
goto unm_unm_err_out;
@@ -419,9 +420,18 @@
} INDEX_TYPE;
-/*
+/**
+ * ntfs_filldir - ntfs specific filldir method
+ * @vol: current ntfs volume
+ * @filp: open file descriptor for the current directory
+ * @ndir: ntfs inode of current directory
+ * @index_type: specifies whether @iu is an index root or an index allocation
+ * @iu: index root or index allocation attribute to which @ie belongs
+ * @ie: current index entry
+ * @name: buffer to use for the converted name
+ * @dirent: vfs filldir callback context
+ * filldir: vfs filldir callback
+ *
* Convert the Unicode name to the loaded NLS and pass it to
* the filldir callback.
- *
- * If @is_ia is TRUE, iu is an INDEX_ALLOCATION. Otherwise it is an INDEX_ROOT.
*/
static inline int ntfs_filldir(ntfs_volume *vol, struct file *filp,
@@ -432,4 +442,6 @@
int name_len;
unsigned dt_type;
+ FILE_NAME_TYPE_FLAGS name_type;
+ READDIR_OPTIONS readdir_opts;
/* Advance the position even if going to skip the entry. */
@@ -441,12 +453,26 @@
else /* if (index_type == INDEX_TYPE_ROOT) */
filp->f_pos = (u8*)ie - (u8*)iu.ir;
- if (ie->key.file_name.file_name_type == FILE_NAME_DOS) {
- ntfs_debug("Skipping DOS only name space entry.");
+ readdir_opts = vol->readdir_opts;
+ name_type = ie->key.file_name.file_name_type;
+ if (name_type == FILE_NAME_DOS && RHideDosNames(readdir_opts)) {
+ ntfs_debug("Skipping DOS name space entry.");
return 0;
}
+ if (RHideLongNames(readdir_opts)) {
+ if (name_type == FILE_NAME_WIN32 ||
+ name_type == FILE_NAME_POSIX) {
+ ntfs_debug("Skipping WIN32/POSIX name space entry.");
+ return 0;
+ }
+ }
if (MREF_LE(ie->indexed_file) == FILE_root) {
ntfs_debug("Skipping root directory self reference entry.");
return 0;
}
+ if (MREF_LE(ie->indexed_file) < FILE_first_user &&
+ RHideSystemFiles(readdir_opts)) {
+ ntfs_debug("Skipping system file.");
+ return 0;
+ }
name_len = ntfs_ucstonls(vol, (uchar_t*)&ie->key.file_name.file_name,
ie->key.file_name.file_name_length, &name,
@@ -552,9 +578,9 @@
ctx)) {
ntfs_error(sb, "Index root attribute missing in directory "
- "inode %Li.", (unsigned long long)ndir->mft_no);
+ "inode 0x%Lx.",
+ (unsigned long long)ndir->mft_no);
err = -EIO;
goto kf_unm_err_out;
}
- /* FIXME: Clean up search context. */
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
@@ -612,5 +638,5 @@
ctx)) {
ntfs_error(sb, "Index bitmap attribute missing in "
- "directory inode %Li.",
+ "directory inode 0x%Lx.",
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -661,5 +687,5 @@
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
- "inode %Li or driver bug.",
+ "inode 0x%Lx or driver bug.",
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -669,8 +695,8 @@
~(s64)(ndir->index_block_size - 1)) >>
ndir->index_vcn_size_bits) {
- ntfs_error(sb, "Actual VCN (%Li) of index buffer is "
- "different from expected VCN (%Li). "
- "Directory inode %Li is corrupt or "
- "driver bug. ",
+ ntfs_error(sb, "Actual VCN (0x%Lx) of index buffer is "
+ "different from expected VCN (0x%Lx). "
+ "Directory inode 0x%Lx is corrupt or driver "
+ "bug. ",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)ia_pos >> ndir->index_vcn_size_bits,
@@ -681,9 +707,9 @@
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
ndir->index_block_size) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "has a size (%u) differing from the directory "
- "specified size (%u). Directory inode is "
- "corrupt or driver bug.", (long long)ia_pos >>
- ndir->index_vcn_size_bits,
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx has a size (%u) differing from the "
+ "directory specified size (%u). Directory "
+ "inode is corrupt or driver bug.",
+ (long long)ia_pos >> ndir->index_vcn_size_bits,
(unsigned long long)ndir->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
@@ -694,7 +720,7 @@
index_end = (u8*)ia + ndir->index_block_size;
if (index_end > kaddr + PAGE_CACHE_SIZE) {
- ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
- "crosses page boundary. Impossible! Cannot "
- "access! This is probably a bug in the "
+ ntfs_error(sb, "Index buffer (VCN 0x%Lx) of directory inode "
+ "0x%Lx crosses page boundary. Impossible! "
+ "Cannot access! This is probably a bug in the "
"driver.", (long long)ia_pos >>
ndir->index_vcn_size_bits,
@@ -706,6 +732,6 @@
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + ndir->index_block_size) {
- ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
- "inode %Li exceeds maximum size.",
+ ntfs_error(sb, "Size of index buffer (VCN 0x%Lx) of directory "
+ "inode 0x%Lx exceeds maximum size.",
(long long)ia_pos >> ndir->index_vcn_size_bits,
(unsigned long long)ndir->mft_no);
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.68
retrieving revision 1.68.4.1
diff -U2 -r1.68 -r1.68.4.1
--- inode.c 14 Feb 2002 06:07:14 -0000 1.68
+++ inode.c 4 Mar 2002 19:04:02 -0000 1.68.4.1
@@ -78,11 +78,11 @@
atomic_set(&ni->count, 1);
ni->vol = NULL;
- ni->run_list = NULL;
+ INIT_RUN_LIST(&ni->run_list);
init_rwsem(&ni->mrec_lock);
atomic_set(&ni->mft_count, 0);
ni->page = NULL;
ni->attr_list = NULL;
- ni->attr_list_rl = NULL;
- ni->bmp_rl = NULL;
+ INIT_RUN_LIST(&ni->attr_list_rl);
+ INIT_RUN_LIST(&ni->bmp_rl);
init_MUTEX(&ni->extent_lock);
ni->base_ntfs_ino = NULL;
@@ -376,10 +376,13 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_AttrListNonResident;
- /* Setup the run list. */
- ni->attr_list_rl = decompress_mapping_pairs(vol,
+ /*
+ * Setup the run list. No need for locking as we have
+ * exclusive access to the inode at this time.
+ */
+ ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->attr_list_rl)) {
- err = PTR_ERR(ni->attr_list_rl);
- ni->attr_list_rl = NULL;
+ if (IS_ERR(ni->attr_list_rl.rl)) {
+ err = PTR_ERR(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -389,6 +392,9 @@
goto ec_put_unm_err_out;
}
- /* Now load the attribute list. */
- if ((err = load_attribute_list(vol, ni->attr_list_rl,
+ /*
+ * Now load the attribute list. Again no need for
+ * locking as above.
+ */
+ if ((err = load_attribute_list(vol, ni->attr_list_rl.rl,
ni->attr_list, ni->attr_list_size))) {
ntfs_error(vi->i_sb, "Failed to load "
@@ -447,5 +453,6 @@
if (ctx->attr->flags & ATTR_COMPRESSION_MASK) {
ntfs_error(vi->i_sb, "Found encrypted and "
- "compressed data.");
+ "compressed attribute. Not "
+ "allowed.");
goto put_unm_err_out;
}
@@ -539,24 +546,17 @@
goto put_unm_err_out;
}
- if (!sle64_to_cpu(ctx->attr->lowest_vcn)) {
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
- ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
- } else
- /*
- * Just a rough guess as ->*_size are not defined for
- * attribute extents. We could just find the base
- * attribute extent but this way is faster and not too
- * much off unless the directory is ridiculously big or
- * very fragmented or sparse.
- */
- vi->i_size = ni->initialized_size =
- sle64_to_cpu(ctx->attr->highest_vcn)
- << vol->cluster_size_bits;
- /* Setup the run list. */
- ni->run_list = decompress_mapping_pairs(vol, ctx->attr, NULL);
- if (IS_ERR(ni->run_list)) {
- err = PTR_ERR(ni->run_list);
- ni->run_list = NULL;
+ vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ ni->initialized_size = sle64_to_cpu(
+ ctx->attr->initialized_size);
+ ni->allocated_size = sle64_to_cpu(ctx->attr->allocated_size);
+ /*
+ * Setup the run list. No need for locking as we have exclusive
+ * access to the inode at this time.
+ */
+ ni->run_list.rl = decompress_mapping_pairs(vol, ctx->attr,
+ NULL);
+ if (IS_ERR(ni->run_list.rl)) {
+ err = PTR_ERR(ni->run_list.rl);
+ ni->run_list.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs decompression "
"failed with error code %i.", -err);
@@ -579,24 +579,19 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
- if (!sle64_to_cpu(ctx->attr->lowest_vcn))
- ni->bmp_size = sle64_to_cpu(
- ctx->attr->data_size);
- else
- /*
- * Just a rough guess as ->*_size are not
- * defined for extents. We could just find the
- * base extent but this way is faster and not
- * too much off unless the directory is
- * ridiculously big / very fragmented or sparse.
- */
- ni->bmp_size = sle64_to_cpu(
- ctx->attr->highest_vcn)
- << vol->cluster_size_bits;
- /* Setup the run list. */
- ni->bmp_rl = decompress_mapping_pairs(vol, ctx->attr,
+ ni->bmp_size = sle64_to_cpu(
+ ctx->attr->data_size);
+ ni->bmp_initialized_size = sle64_to_cpu(
+ ctx->attr->initialized_size);
+ ni->bmp_allocated_size = sle64_to_cpu(
+ ctx->attr->allocated_size);
+ /*
+ * Setup the run list. No need for locking as we have
+ * exclusive access to the inode at this time.
+ */
+ ni->bmp_rl.rl = decompress_mapping_pairs(vol, ctx->attr,
NULL);
- if (IS_ERR(ni->bmp_rl)) {
- err = PTR_ERR(ni->bmp_rl);
- ni->bmp_rl = NULL;
+ if (IS_ERR(ni->bmp_rl.rl)) {
+ err = PTR_ERR(ni->bmp_rl.rl);
+ ni->bmp_rl.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -605,12 +600,14 @@
}
} else
- ni->bmp_size = le32_to_cpu(ctx->attr->value_length);
+ ni->bmp_size = ni->bmp_initialized_size =
+ ni->bmp_allocated_size =
+ le32_to_cpu(ctx->attr->value_length);
/* Consistency check bitmap size vs. index allocation size. */
- if (ni->bmp_size << 3 < ni->initialized_size >>
+ if (ni->bmp_size << 3 < vi->i_size >>
ni->index_block_size_bits) {
ntfs_error(vi->i_sb, "$I30 bitmap too small (0x%Lx) "
"for index allocation (0x%Lx).",
(long long)ni->bmp_size << 3,
- (long long)ni->initialized_size);
+ vi->i_size);
goto put_unm_err_out;
}
@@ -631,8 +628,9 @@
vi->i_mapping->a_ops = &ntfs_dir_aops;
} else {
- /* It is a file, find the unnamed data attribute. */
+ /* It is a file: find first extent of unnamed data attribute. */
reinit_attr_search_ctx(ctx);
if (!lookup_attr(AT_DATA, NULL, 0, 0, 0, NULL, 0, ctx)) {
- vi->i_size = ni->initialized_size = 0LL;
+ vi->i_size = ni->initialized_size =
+ ni->allocated_size = 0LL;
/*
* FILE_Secure does not have an unnamed $DATA
@@ -658,5 +656,5 @@
goto put_unm_err_out;
}
- /* Set up the state. */
+ /* Setup the state. */
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_NonResident;
@@ -707,9 +705,14 @@
/* $MFT is special as we have the run_list already. */
if (likely(vi->i_ino != FILE_MFT)) {
- ni->run_list = decompress_mapping_pairs(vol,
+ /*
+ * Setup the run list. No need for locking as
+ * we have exclusive access to the inode at
+ * this time.
+ */
+ ni->run_list.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->run_list)) {
- err = PTR_ERR(ni->run_list);
- ni->run_list = NULL;
+ if (IS_ERR(ni->run_list.rl)) {
+ err = PTR_ERR(ni->run_list.rl);
+ ni->run_list.rl = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed "
@@ -719,25 +722,22 @@
}
}
- if (sle64_to_cpu(ctx->attr->lowest_vcn))
- /*
- * Just a rough guess as ->*_size are not
- * defined for attribute extents. We could
- * just find the base attribute extent but
- * this way is faster and not too much off,
- * unless the file is ridiculously big or very
- * fragmented or compressed or sparse.
- */
- vi->i_size = ni->initialized_size =
- sle64_to_cpu(
- ctx->attr->highest_vcn) <<
- vol->cluster_size_bits;
- else {
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
- ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
- }
+ /* Setup all the sizes. */
+ vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ ni->initialized_size = sle64_to_cpu(
+ ctx->attr->initialized_size);
+ ni->allocated_size = sle64_to_cpu(
+ ctx->attr->allocated_size);
+ if (NInoCompressed(ni))
+ ni->compressed_size = sle64_to_cpu(
+ ctx->attr->compressed_size);
} else { /* Resident attribute. */
- vi->i_size = le32_to_cpu(ctx->attr->value_length);
- ni->initialized_size = 0LL;
+ /*
+ * Make all sizes equal for simplicity in read code
+ * paths. FIXME: Need to keep this in mind when
+ * converting to non-resident attribute in write code
+ * path. (Probably only affects truncate().)
+ */
+ vi->i_size = ni->initialized_size = ni->allocated_size =
+ le32_to_cpu(ctx->attr->value_length);
}
no_data_attr_special_case:
@@ -756,6 +756,19 @@
vi->i_mapping->a_ops = &ntfs_file_aops;
}
- /* The number of 512-byte blocks (for stat). */
- vi->i_blocks = vi->i_size >> 9;
+ /*
+ * The number of 512-byte blocks used on disk (for stat). This is in so
+ * far inaccurate as it doesn't account for any named streams or other
+ * special non-resident attributes, but that is how Windows works, too,
+ * so we are at least consistent with Windows, if not entirely
+ * consistent with the Linux Way. Doing it the Linux Way would cause a
+ * significant slowdown as it would involve iterating over all
+ * attributes in the mft record and adding the allocated/compressed
+ * sizes of all non-resident attributes present to give us the Linux
+ * correct size that should go into i_blocks (after division by 512).
+ */
+ if (!NInoCompressed(ni))
+ vi->i_blocks = ni->allocated_size >> 9;
+ else
+ vi->i_blocks = ni->compressed_size >> 9;
/* Done. */
put_attr_search_ctx(ctx);
@@ -917,9 +930,9 @@
ni->state |= 1 << NI_AttrListNonResident;
/* Setup the run list. */
- ni->attr_list_rl = decompress_mapping_pairs(vol,
+ ni->attr_list_rl.rl = decompress_mapping_pairs(vol,
ctx->attr, NULL);
- if (IS_ERR(ni->attr_list_rl)) {
- err = PTR_ERR(ni->attr_list_rl);
- ni->attr_list_rl = NULL;
+ if (IS_ERR(ni->attr_list_rl.rl)) {
+ err = PTR_ERR(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
ntfs_error(sb, "Mapping pairs decompression "
"failed with error code %i.",
@@ -928,5 +941,5 @@
}
/* Now load the attribute list. */
- if ((err = load_attribute_list(vol, ni->attr_list_rl,
+ if ((err = load_attribute_list(vol, ni->attr_list_rl.rl,
ni->attr_list, ni->attr_list_size))) {
ntfs_error(sb, "Failed to load attribute list "
@@ -1015,5 +1028,5 @@
next_vcn = last_vcn = highest_vcn = 0;
while (lookup_attr(AT_DATA, NULL, 0, 0, next_vcn, NULL, 0, ctx)) {
- run_list *nrl;
+ run_list_element *nrl;
/* Cache the current attribute. */
@@ -1036,8 +1049,10 @@
}
/*
- * Decompress the mapping pairs array of this extent
- * and merge the result into the existing run list.
+ * Decompress the mapping pairs array of this extent and merge
+ * the result into the existing run list. No need for locking
+ * as we have exclusive access to the inode at this time and we
+ * are a mount in progress task, too.
*/
- nrl = decompress_mapping_pairs(vol, attr, ni->run_list);
+ nrl = decompress_mapping_pairs(vol, attr, ni->run_list.rl);
if (IS_ERR(nrl)) {
ntfs_error(sb, "decompress_mapping_pairs() failed with "
@@ -1046,5 +1061,5 @@
goto put_err_out;
}
- ni->run_list = nrl;
+ ni->run_list.rl = nrl;
/* Are we in the first extent? */
@@ -1057,4 +1072,6 @@
ni->initialized_size =
sle64_to_cpu(attr->initialized_size);
+ ni->allocated_size =
+ sle64_to_cpu(attr->allocated_size);
/* Set the number of mft records. */
vol->nr_mft_records = vi->i_size >>
@@ -1237,7 +1254,15 @@
}
/* Free all alocated memory. */
- ntfs_free(ni->run_list);
+ write_lock(&ni->run_list.lock);
+ ntfs_free(ni->run_list.rl);
+ ni->run_list.rl = NULL;
+ write_unlock(&ni->run_list.lock);
+
ntfs_free(ni->attr_list);
- ntfs_free(ni->attr_list_rl);
+
+ write_lock(&ni->attr_list_rl.lock);
+ ntfs_free(ni->attr_list_rl.rl);
+ ni->attr_list_rl.rl = NULL;
+ write_unlock(&ni->attr_list_rl.lock);
}
@@ -1266,6 +1291,9 @@
__ntfs_clear_inode(ni);
- if (S_ISDIR(vi->i_mode))
- ntfs_free(ni->bmp_rl);
+ if (S_ISDIR(vi->i_mode)) {
+ write_lock(&ni->bmp_rl.lock);
+ ntfs_free(ni->bmp_rl.rl);
+ write_unlock(&ni->bmp_rl.lock);
+ }
return;
}
Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.h,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -U2 -r1.15 -r1.15.4.1
--- inode.h 14 Feb 2002 06:07:14 -0000 1.15
+++ inode.h 4 Mar 2002 19:04:02 -0000 1.15.4.1
@@ -35,5 +35,6 @@
*/
struct _ntfs_inode {
- s64 initialized_size; /* Copy from unnamed $DATA attribute. */
+ s64 initialized_size; /* Copy from $DATA/$INDEX_ALLOCATION. */
+ s64 allocated_size; /* Copy from $DATA/$INDEX_ALLOCATION. */
unsigned long state; /* NTFS specific flags describing this inode.
See fs/ntfs/ntfs.h:ntfs_inode_state_bits. */
@@ -42,14 +43,14 @@
atomic_t count; /* Inode reference count for book keeping. */
ntfs_volume *vol; /* Pointer to the ntfs volume of this inode. */
- run_list *run_list; /* If state has the NI_NonResident bit set,
+ run_list run_list; /* If state has the NI_NonResident bit set,
the run list of the unnamed data attribute
(if a file) or of the index allocation
- attribute (directory). If run_list is NULL,
- the run list has not been read in or has
- been unmapped. If NI_NonResident is clear,
- the unnamed data attribute is resident (file)
- or there is no $I30 index allocation
- attribute (directory). In that case run_list
- is always NULL.*/
+ attribute (directory). If run_list.rl is
+ NULL, the run list has not been read in or
+ has been unmapped. If NI_NonResident is
+ clear, the unnamed data attribute is
+ resident (file) or there is no $I30 index
+ allocation attribute (directory). In that
+ case run_list.rl is always NULL.*/
struct rw_semaphore mrec_lock; /* Lock for serializing access to the
mft record belonging to this inode. */
@@ -69,5 +70,5 @@
u32 attr_list_size; /* Length of attribute list value in bytes. */
u8 *attr_list; /* Attribute list value itself. */
- run_list *attr_list_rl; /* Run list for the attribute list value. */
+ run_list attr_list_rl; /* Run list for the attribute list value. */
union {
struct { /* It is a directory or $MFT. */
@@ -78,15 +79,18 @@
u8 index_vcn_size_bits; /* Log2 of the above. */
s64 bmp_size; /* Size of the $I30 bitmap. */
- run_list *bmp_rl; /* Run list for the $I30 bitmap
+ s64 bmp_initialized_size; /* Copy from $I30 bitmap. */
+ s64 bmp_allocated_size; /* Copy from $I30 bitmap. */
+ run_list bmp_rl; /* Run list for the $I30 bitmap
if it is non-resident. */
};
struct { /* It is a compressed file. */
- u32 compression_block_size; /* Size of a compression
- block (cb). */
+ u32 compression_block_size; /* Size of a compression
+ block (cb). */
u8 compression_block_size_bits; /* Log2 of the size of
a cb. */
- u8 compression_block_clusters; /* Number of clusters
- per compression
- block. */
+ u8 compression_block_clusters; /* Number of clusters
+ per compression
+ block. */
+ s64 compressed_size; /* Copy from $DATA. */
};
};
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.49
retrieving revision 1.49.4.1
diff -U2 -r1.49 -r1.49.4.1
--- mft.c 14 Feb 2002 06:07:14 -0000 1.49
+++ mft.c 4 Mar 2002 19:04:02 -0000 1.49.4.1
@@ -148,5 +148,5 @@
* Note, we only setup asynchronous I/O on the page and return. I/O completion
* is signalled via our asynchronous I/O completion handler
- * end_buffer_read_mft_async().
+ * end_buffer_read_index_async().
*/
static int ntfs_mft_readpage(struct file *file, struct page *page)
@@ -181,5 +181,5 @@
blocks = PAGE_CACHE_SIZE >> blocksize_bits;
iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
- lblock = (ni->initialized_size + blocksize - 1) >> blocksize_bits;
+ lblock = (ni->allocated_size + blocksize - 1) >> blocksize_bits;
bh = head = page->buffers;
@@ -187,5 +187,5 @@
#ifdef DEBUG
- if (!ni->run_list)
+ if (!ni->run_list.rl)
panic("NTFS: $MFT/$DATA run list has been unmapped! This is a "
"very serious bug! Cannot continue...");
@@ -205,5 +205,7 @@
vol->cluster_size_mask;
/* Convert the vcn to the corresponding lcn. */
- lcn = vcn_to_lcn(ni->run_list, vcn);
+ read_lock(&ni->run_list.lock);
+ lcn = vcn_to_lcn(ni->run_list.rl, vcn);
+ read_unlock(&ni->run_list.lock);
if (lcn >= 0) {
/* Setup buffer head to correct block. */
@@ -216,5 +218,5 @@
}
ntfs_error(sb, "vcn_to_lcn(vcn = 0x%Lx) failed with "
- "error code %Li.", (long long)vcn,
+ "error code 0x%Lx.", (long long)vcn,
(long long)-lcn);
// FIXME: Depending on vol->on_errors, do something.
Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.29
retrieving revision 1.29.6.1
diff -U2 -r1.29 -r1.29.6.1
--- ntfs.h 8 Feb 2002 05:17:11 -0000 1.29
+++ ntfs.h 4 Mar 2002 19:04:02 -0000 1.29.6.1
@@ -223,6 +223,6 @@
int val;
char *str;
-} on_errors_str;
-extern on_errors_str on_errors_arr[];
+} option_t;
+extern const option_t on_errors_arr[];
/* From fs/ntfs/compress.c */
Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.77
retrieving revision 1.77.4.1
diff -U2 -r1.77 -r1.77.4.1
--- super.c 25 Feb 2002 02:49:33 -0000 1.77
+++ super.c 4 Mar 2002 19:04:02 -0000 1.77.4.1
@@ -35,5 +35,5 @@
static unsigned long ntfs_nr_compression_users = 0;
-/* Error constants/strings from super.c used in inode.c::ntfs_show_options(). */
+/* Error constants/strings used in inode.c::ntfs_show_options(). */
typedef enum {
ON_ERRORS_PANIC = 0x01,
@@ -43,16 +43,47 @@
} ON_ERRORS_ACTIONS;
-on_errors_str on_errors_arr[] = {
- { ON_ERRORS_PANIC, "panic" },
- { ON_ERRORS_REMOUNT_RO, "remount-ro", },
- { ON_ERRORS_CONTINUE, "continue", },
- { ON_ERRORS_RECOVER, "recover" },
- { ON_ERRORS_RECOVER || ON_ERRORS_PANIC, "recover_or_panic" },
- { ON_ERRORS_RECOVER || ON_ERRORS_REMOUNT_RO, "recover_or_remount-ro" },
- { ON_ERRORS_RECOVER || ON_ERRORS_CONTINUE, "recover_or_continue" },
- { 0, NULL }
+const option_t on_errors_arr[] = {
+ { ON_ERRORS_PANIC, "panic" },
+ { ON_ERRORS_REMOUNT_RO, "remount-ro", },
+ { ON_ERRORS_CONTINUE, "continue", },
+ { ON_ERRORS_RECOVER, "recover" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_PANIC, "recover_or_panic" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_REMOUNT_RO, "recover_or_remount-ro" },
+ { ON_ERRORS_RECOVER | ON_ERRORS_CONTINUE, "recover_or_continue" },
+ { 0, NULL }
+};
+
+static const option_t readdir_opts_arr[] = {
+ { SHOW_SYSTEM, "system" },
+ { SHOW_WIN32, "win32" },
+ { SHOW_WIN32, "long" },
+ { SHOW_DOS, "dos" },
+ { SHOW_DOS, "short" },
+ { SHOW_POSIX, "posix" },
+ { SHOW_ALL, "all" },
+ { 0, NULL }
};
/**
+ * simple_getbool -
+ *
+ * Copied from old ntfs driver (which copied from vfat driver).
+ */
+static int simple_getbool(char *s, BOOL *setval)
+{
+ if (s) {
+ if (!strcmp(s, "1") || !strcmp(s, "yes") || !strcmp(s, "true"))
+ *setval = TRUE;
+ else if (!strcmp(s, "0") || !strcmp(s, "no") ||
+ !strcmp(s, "false"))
+ *setval = FALSE;
+ else
+ return 0;
+ } else
+ *setval = TRUE;
+ return 1;
+}
+
+/**
* parse_options - parse the (re)mount options
* @vol: ntfs volume
@@ -64,10 +95,11 @@
{
char *p, *v, *ov;
+ static char *utf8 = "utf8";
int errors = 0, sloppy = 0;
uid_t uid = (uid_t)-1;
gid_t gid = (gid_t)-1;
mode_t fmask = (mode_t)-1, dmask = (mode_t)-1;
- int mft_zone_multiplier = -1, on_errors = -1;
- struct nls_table *nls_map = NULL;
+ int mft_zone_multiplier = -1, on_errors = -1, readdir_opts = -1;
+ struct nls_table *nls_map = NULL, *old_nls;
/* I am lazy... (-8 */
@@ -120,8 +152,49 @@
else NTFS_GETOPT_OPTIONS_ARRAY("errors", on_errors,
on_errors_arr)
- else if (!strcmp(p, "nls") || !strcmp(p, "iocharset")) {
- struct nls_table *old_nls;
+ else NTFS_GETOPT_OPTIONS_ARRAY("show_inodes", readdir_opts,
+ readdir_opts_arr)
+ else if (!strcmp(p, "show_system_files")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option show_system_files is "
+ "deprecated. Please use option "
+ "show_inodes=system in the future.");
+ if (!v || !*v)
+ val = TRUE;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ if (readdir_opts == -1)
+ readdir_opts = 0;
+ readdir_opts |= SHOW_SYSTEM;
+ }
+ } else if (!strcmp(p, "posix")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option posix is deprecated. "
+ "Please use option show_inodes=posix "
+ "instead. Be aware that some userspace "
+ "applications may be confused by this, "
+ "since the short and long names of "
+ "directory inodes will have the same inode "
+ "numbers, yet each will only have a link "
+ "count of 1 due to Linux not supporting "
+ "directory hard links.");
if (!v || !*v)
goto needs_arg;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ if (readdir_opts == -1)
+ readdir_opts = 0;
+ readdir_opts |= SHOW_POSIX;
+ }
+ } else if (!strcmp(p, "nls") || !strcmp(p, "iocharset")) {
+ if (!strcmp(p, "iocharset"))
+ ntfs_warning(vol->sb, "Option iocharset is "
+ "deprecated. Please use "
+ "option nls=<charsetname> in "
+ "the future.");
+ if (!v || !*v)
+ goto needs_arg;
+use_utf8:
old_nls = nls_map;
nls_map = load_nls(v);
@@ -140,4 +213,19 @@
unload_nls(old_nls);
}
+ } else if (!strcmp(p, "utf8")) {
+ BOOL val = FALSE;
+ ntfs_warning(vol->sb, "Option utf8 is no longer "
+ "supported, using option nls=utf8. Please "
+ "use option nls=utf8 in the future and "
+ "make sure utf8 is compiled either as a "
+ "module or into the kernel.");
+ if (!v || !*v)
+ val = TRUE;
+ else if (!simple_getbool(v, &val))
+ goto needs_bool;
+ if (val) {
+ v = utf8;
+ goto use_utf8;
+ }
} else {
ntfs_error(vol->sb, "Unrecognized mount option %s.", p);
@@ -211,8 +299,13 @@
if (dmask != (mode_t)-1)
vol->dmask = dmask;
+ if (readdir_opts != -1)
+ vol->readdir_opts = readdir_opts;
return TRUE;
needs_arg:
ntfs_error(vol->sb, "The %s option requires an argument.", p);
return FALSE;
+needs_bool:
+ ntfs_error(vol->sb, "The %s option requires a boolean argument.", p);
+ return FALSE;
needs_val:
ntfs_error(vol->sb, "Invalid %s option argument: %s", p, ov);
@@ -339,28 +432,4 @@
/**
- * get_nr_blocks - get the number of NTFS_BLOCK_SIZE blocks on a device
- * @dev: device
- *
- * Get the number of NTFS_BLOCK_SIZE bytes sized blocks on the device @dev and
- * return it if successful or return 0 on error.
- *
- * FIXME: At the moment, we are happy as the kernel uses 512 byte blocks, which
- * also happens to be the NTFS_BLOCK_SIZE. In the future, when the kernel
- * implementation changes, this function will need to change to convert the
- * number into NTFS_BLOCK_SIZE sized blocks.
- */
-static long get_nr_blocks(const kdev_t dev)
-{
- struct gendisk *gd = get_gendisk(dev);
-
- if (gd)
- return gd->part[minor(dev)].nr_sects;
- if ((major(dev) == LOOP_MAJOR) && blk_size[major(dev)])
- return blk_size[major(dev)][minor(dev)] << BLOCK_SIZE_BITS
- >> NTFS_BLOCK_SIZE_BITS;
- return (long)0;
-}
-
-/**
* read_boot_sector - read the NTFS boot sector of a device
* @sb: super block of device to read the boot sector from
@@ -618,5 +687,5 @@
/**
- * load_and_init_upcase -
+ * load_and_init_upcase - load the upcase table for an ntfs volume
* @vol: ntfs super block describing device whose upcase to load
*
@@ -654,24 +723,12 @@
size = PAGE_CACHE_SIZE;
while (index < max_index) {
+ /* Read the upcase table and copy it into the linear buffer. */
read_partial_upcase_page:
- /*
- * Read the page from page cache, getting it from backing store
- * if necessary, and increment the use count.
- */
- page = read_cache_page(ino->i_mapping, index, (filler_t*)
- ino->i_mapping->a_ops->readpage, NULL);
+ page = ntfs_map_page(ino->i_mapping, index);
if (IS_ERR(page))
- /* Sync io failed. */
- goto iput_upcase_failed;
- wait_on_page(page);
- if (!Page_Uptodate(page)) {
- /* Async io failed. */
- page_cache_release(page);
goto iput_upcase_failed;
- }
memcpy((char*)vol->upcase + (index++ << PAGE_CACHE_SHIFT),
- kmap(page), size);
- kunmap(page);
- page_cache_release(page);
+ page_address(page), size);
+ ntfs_unmap_page(page);
};
if (size == PAGE_CACHE_SIZE) {
@@ -680,5 +737,5 @@
goto read_partial_upcase_page;
}
- vol->upcase_len = ino->i_size >> 1 /* uchar_t_size_shift */;
+ vol->upcase_len = ino->i_size >> UCHAR_T_SIZE_BITS;
ntfs_debug("Read %Lu bytes from $UpCase (expected %u bytes).",
ino->i_size, 64 * 1024 * sizeof(uchar_t));
@@ -692,5 +749,5 @@
}
max = default_upcase_len;
- if (vol->upcase_len < default_upcase_len)
+ if (max > vol->upcase_len)
max = vol->upcase_len;
for (i = 0; i < max; i++)
@@ -749,5 +806,5 @@
VOLUME_INFORMATION *vi;
attr_search_context *ctx;
- run_list *rl;
+ run_list_element *rl;
ntfs_debug("Entering.");
@@ -770,5 +827,5 @@
next_vcn = last_vcn = highest_vcn = 0;
while (lookup_attr(AT_BITMAP, NULL, 0, 0, next_vcn, NULL, 0, ctx)) {
- run_list *nrl;
+ run_list_element *nrl;
/* Cache the current attribute extent. */
@@ -792,5 +849,7 @@
/*
* Decompress the mapping pairs array of this extent
- * and merge the result into the existing run list.
+ * and merge the result into the existing run list. Note we
+ * don't need any locking at this stage as we are already
+ * running exclusively as we are mount in progress task.
*/
nrl = decompress_mapping_pairs(vol, attr, rl);
@@ -808,9 +867,11 @@
last_vcn = sle64_to_cpu(attr->allocated_size) >>
vol->cluster_size_bits;
+ vol->mftbmp_size = sle64_to_cpu(attr->data_size);
vol->mftbmp_initialized_size =
sle64_to_cpu(attr->initialized_size);
+ vol->mftbmp_allocated_size =
+ sle64_to_cpu(attr->allocated_size);
/* Consistency check. */
- if (vol->mftbmp_initialized_size <
- (vol->nr_mft_records + 7) >> 3) {
+ if (vol->mftbmp_size < (vol->nr_mft_records + 7) >> 3) {
ntfs_error(sb, "$MFT/$BITMAP is too short to "
"contain a complete mft "
@@ -862,8 +923,6 @@
}
- down_write(&vol->mftbmp_lock);
-
/* Setup the run list and the address space in the volume structure. */
- vol->mftbmp_rl = rl;
+ vol->mftbmp_rl.rl = rl;
vol->mftbmp_mapping.a_ops = &ntfs_mftbmp_aops;
@@ -871,6 +930,4 @@
vol->mftbmp_mapping.host = NULL;
- up_write(&vol->mftbmp_lock);
-
// FIXME: If mounting read-only, it would be ok to ignore errors when
// loading the mftbmp but we then need to make sure nobody remounts the
@@ -891,8 +948,10 @@
if (!load_and_init_upcase(vol))
goto iput_mirr_err_out;
- /* Get the cluster allocation bitmap inode and verify the size. */
- down_write(&vol->lcnbmp_lock);
+ /*
+ * Get the cluster allocation bitmap inode and verify the size, no
+ * need for any locking at this stage as we are already running
+ * exclusively as we are mount in progress task.
+ */
vol->lcnbmp_ino = iget(sb, FILE_Bitmap);
- up_write(&vol->lcnbmp_lock);
if (!vol->lcnbmp_ino || is_bad_inode(vol->lcnbmp_ino)) {
if (is_bad_inode(vol->lcnbmp_ino))
@@ -1066,17 +1125,20 @@
/*
* Clean up mft bitmap address space. Ignore the _inode_ bit in the
- * name...
+ * name of the function... FIXME: What does this do with dirty pages?
+ * (ask Al Viro)
*/
truncate_inode_pages(&vol->mftbmp_mapping, 0);
vol->mftbmp_mapping.a_ops = NULL;
vol->mftbmp_mapping.host = NULL;
- ntfs_free(vol->mftbmp_rl);
- vol->mftbmp_rl = NULL;
up_write(&vol->mftbmp_lock);
+ write_lock(&vol->mftbmp_rl.lock);
+ ntfs_free(vol->mftbmp_rl.rl);
+ vol->mftbmp_rl.rl = NULL;
+ write_unlock(&vol->mftbmp_rl.lock);
vol->upcase_len = 0;
/*
* Decrease the number of mounts and destroy the global default upcase
* table if necessary. Also decrease the number of upcase users if we
- * are were user.
+ * are a user.
*/
down(&ntfs_lock);
@@ -1391,10 +1453,10 @@
/**
- * ntfs_read_super - mount an ntfs files system
+ * ntfs_fill_super - mount an ntfs files system
* @sb: super block of ntfs file system to mount
* @opt: string containing the mount options
* @silent: silence error output
*
- * ntfs_read_super() is called by the VFS to mount the device described by @sb
+ * ntfs_fill_super() is called by the VFS to mount the device described by @sb
* with the mount otions in @data with the NTFS file system.
*
@@ -1408,6 +1470,5 @@
* NOTE: @sb->s_flags contains the mount options flags.
*/
-struct super_block *ntfs_read_super(struct super_block *sb, void *opt,
- const int silent)
+static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
{
extern int *blksize_size[];
@@ -1426,5 +1487,5 @@
ntfs_error(sb, "Allocation of NTFS volume structure "
"failed. Aborting mount...");
- goto imm_err_out_now;
+ return -ENOMEM;
}
/* Initialize ntfs_volume structure. */
@@ -1442,5 +1503,5 @@
vol->mftbmp_mapping.i_mmap_shared = NULL;
spin_lock_init(&vol->mftbmp_mapping.i_shared_lock);
- vol->mftbmp_rl = NULL;
+ INIT_RUN_LIST(&vol->mftbmp_rl);
vol->mftmirr_ino = NULL;
vol->lcnbmp_ino = NULL;
@@ -1453,4 +1514,5 @@
vol->mft_zone_multiplier = 0;
vol->nls_map = NULL;
+
/*
* Default is group and other don't have write/execute access to files
@@ -1460,4 +1522,10 @@
vol->dmask = 0022;
+ /*
+ * Default is to show long file names (including POSIX file names), and
+ * not to show system files and short file names.
+ */
+ vol->readdir_opts = SHOW_WIN32;
+
/* Important to get the mount options dealt with now. */
if (!parse_options(vol, (char*)opt))
@@ -1488,10 +1556,6 @@
}
- /* Get the size of the device in NTFS_BLOCK_SIZE byte blocks. */
- if (!(vol->nr_blocks = get_nr_blocks(dev))) {
- if (!silent)
- ntfs_error(sb, "Unable to determine device size.");
- goto set_blk_size_err_out_now;
- }
+ /* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */
+ vol->nr_blocks = sb->s_bdev->bd_inode->i_size >> NTFS_BLOCK_SIZE_BITS;
/* Read the boot sector and return unlocked buffer head to it. */
@@ -1524,5 +1588,14 @@
/* Setup remaining fields in the super block. */
sb->s_magic = NTFS_SB_MAGIC;
- sb->s_maxbytes = ~0ULL >> 1;
+
+ /*
+ * Ntfs allows 63 bits for the file size, i.e. correct would be:
+ * sb->s_maxbytes = ~0ULL >> 1;
+ * But the kernel uses a long as the page cache page index which on
+ * 32-bit architectures is only 32-bits. MAX_LFS_FILESIZE is kernel
+ * defined to the maximum the page cache page index can cope with
+ * without overflowing the index or to 2^63 - 1, whichever is smaller.
+ */
+ sb->s_maxbytes = MAX_LFS_FILESIZE;
/*
@@ -1609,5 +1682,5 @@
}
up(&ntfs_lock);
- return sb;
+ return 0;
}
ntfs_error(sb, "Failed to allocate root directory.");
@@ -1626,6 +1699,9 @@
iput(vol->mftmirr_ino);
vol->mftmirr_ino = NULL;
- ntfs_free(vol->mftbmp_rl);
- vol->mftbmp_rl = NULL;
+ truncate_inode_pages(&vol->mftbmp_mapping, 0);
+ vol->mftbmp_mapping.a_ops = NULL;
+ vol->mftbmp_mapping.host = NULL;
+ ntfs_free(vol->mftbmp_rl.rl);
+ vol->mftbmp_rl.rl = NULL;
vol->upcase_len = 0;
if (vol->upcase != default_upcase)
@@ -1678,7 +1754,6 @@
sb->u.generic_sbp = NULL;
kfree(vol);
-imm_err_out_now:
- ntfs_debug("Exiting, status failed.");
- return NULL;
+ ntfs_debug("Failed, returning -EINVAL.");
+ return -EINVAL;
}
@@ -1721,18 +1796,6 @@
DECLARE_MUTEX(ntfs_lock);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,4)
-static DECLARE_FSTYPE_DEV(ntfs_fs_type, "ntfs", ntfs_read_super);
-#else
-
-int ntfs_fill_super(struct super_block *sb, void *opt, int silent)
-{
- if (ntfs_read_super(sb, opt, silent))
- return 0;
- else
- return -EINVAL;
-}
-
static struct super_block *ntfs_get_sb(struct file_system_type *fs_type,
- int flags, char *dev_name, void *data)
+ int flags, char *dev_name, void *data)
{
return get_sb_bdev(fs_type, flags, dev_name, data, ntfs_fill_super);
@@ -1745,5 +1808,11 @@
fs_flags: FS_REQUIRES_DEV,
};
-#endif /* VERSION >= 2.5.4 */
+
+/* Stable names for the slab caches. */
+static const char *ntfs_attr_ctx_cache_name = "ntfs_attr_ctx_cache";
+static const char *ntfs_name_cache_name = "ntfs_name_cache";
+static const char *ntfs_inode_cache_name = "ntfs_inode_cache";
+static const char *ntfs_big_inode_cache_name = "ntfs_big_inode_cache";
+
static int __init init_ntfs_fs(void)
{
@@ -1767,34 +1836,36 @@
ntfs_debug("Debug messages are enabled.");
- ntfs_attr_ctx_cache = kmem_cache_create("ntfs_actx_cache",
+ ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name,
sizeof(attr_search_context), 0 /* offset */,
SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */);
if (!ntfs_attr_ctx_cache) {
- printk(KERN_CRIT "NTFS: Failed to create "
- "ntfs_actx_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_attr_ctx_cache_name);
goto ctx_err_out;
}
- ntfs_name_cache = kmem_cache_create("ntfs_name_cache",
+ ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name,
(NTFS_MAX_NAME_LEN+1) * sizeof(uchar_t), 0,
SLAB_HWCACHE_ALIGN, NULL, NULL);
if (!ntfs_name_cache) {
- printk(KERN_CRIT "NTFS: Failed to create ntfs_name_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_name_cache_name);
goto name_err_out;
}
- ntfs_inode_cache = kmem_cache_create("ntfs_inode_cache",
+ ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,
sizeof(ntfs_inode), 0, SLAB_HWCACHE_ALIGN, NULL, NULL);
if (!ntfs_inode_cache) {
- printk(KERN_CRIT "NTFS: Failed to create ntfs_inode_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_inode_cache_name);
goto inode_err_out;
}
- ntfs_big_inode_cache = kmem_cache_create("ntfs_b_inode_cache",
+ ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,
sizeof(big_ntfs_inode), 0, SLAB_HWCACHE_ALIGN,
ntfs_big_inode_init_once, NULL);
if (!ntfs_big_inode_cache) {
- printk(KERN_CRIT "NTFS: Failed to create "
- "ntfs_big_inode_cache!\n");
+ printk(KERN_CRIT "NTFS: Failed to create %s!\n",
+ ntfs_big_inode_cache_name);
goto big_inode_err_out;
}
@@ -1840,12 +1911,15 @@
if (kmem_cache_destroy(ntfs_big_inode_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy "
- "ntfs_big_inode_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_big_inode_cache_name);
if (kmem_cache_destroy(ntfs_inode_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_inode_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_inode_cache_name);
if (kmem_cache_destroy(ntfs_name_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_name_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_name_cache_name);
if (kmem_cache_destroy(ntfs_attr_ctx_cache) && (err = 1))
- printk(KERN_CRIT "NTFS: Failed to destroy ntfs_actx_cache.\n");
+ printk(KERN_CRIT "NTFS: Failed to destory %s.\n",
+ ntfs_attr_ctx_cache_name);
if (err)
printk(KERN_CRIT "NTFS: This causes memory to leak! There is "
Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/types.h,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -U2 -r1.3 -r1.3.8.1
--- types.h 3 Feb 2002 19:31:17 -0000 1.3
+++ types.h 4 Mar 2002 19:04:02 -0000 1.3.8.1
@@ -26,4 +26,5 @@
/* 2-byte Unicode character type. */
typedef u16 uchar_t;
+#define UCHAR_T_SIZE_BITS 1
/*
@@ -35,5 +36,5 @@
/**
- * run_list - in memory vcn to lcn mapping array
+ * run_list_element - in memory vcn to lcn mapping array element
* @vcn: starting vcn of the current array element
* @lcn: starting lcn of the current array element
@@ -49,5 +50,26 @@
LCN lcn; /* lcn = Starting logical cluster number. */
s64 length; /* Run length in clusters. */
+} run_list_element;
+
+/**
+ * run_list - in memory vcn to lcn mapping array including a read/write lock
+ * @rl: pointer to an array of run list elements
+ * @lock: read/write spinlock for serializing access to @rl
+ *
+ */
+typedef struct {
+ run_list_element *rl;
+ rwlock_t lock;
} run_list;
+
+#define RUN_LIST_INIT { NULL, RW_LOCK_UNLOCKED }
+
+#define RUN_LIST(name) run_list name = RUN_LIST_INIT
+
+#define INIT_RUN_LIST(runlist) do { \
+ run_list *___rl = runlist; \
+ ___rl->rl = NULL; \
+ ___rl->lock = RW_LOCK_UNLOCKED; \
+ } while (0)
typedef enum {
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/volume.h,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -U2 -r1.6 -r1.6.4.1
--- volume.h 14 Feb 2002 06:12:27 -0000 1.6
+++ volume.h 4 Mar 2002 19:04:02 -0000 1.6.4.1
@@ -26,4 +26,17 @@
#include "types.h"
+/* These are used to determine which inode names are re...
[truncated message content] |
|
From: Anton A. <an...@us...> - 2002-03-04 14:32:45
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfs-driver-tng In directory usw-pr-cvs1:/tmp/cvs-serv6200 Modified Files: ChangeLog Log Message: Update changelog Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -U2 -r1.68 -r1.69 --- ChangeLog 4 Mar 2002 09:36:30 -0000 1.68 +++ ChangeLog 4 Mar 2002 14:32:42 -0000 1.69 @@ -49,4 +49,6 @@ directories. Without this the "find" utility gets very upset which is fair enough as Linux/Unix do not support directory hard links. + - Further run list merging work. (Richard Russon) + - Backwards compatibility for gcc-2.95. (Richard Russon) tng-0.0.7 - 13/02/2002 - The driver is now feature complete for read-only! |
|
From: Anton A. <an...@us...> - 2002-03-04 09:36:33
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfs-driver-tng In directory usw-pr-cvs1:/tmp/cvs-serv25591 Modified Files: ChangeLog Log Message: Forgotten commit from before holiday. Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/ChangeLog,v retrieving revision 1.67 retrieving revision 1.68 diff -U2 -r1.67 -r1.68 --- ChangeLog 14 Feb 2002 06:07:33 -0000 1.67 +++ ChangeLog 4 Mar 2002 09:36:30 -0000 1.68 @@ -3,4 +3,6 @@ Need to enforce limits and zeroes need to be written when overflow is detected. + - Cleanup read_inode in that it can never see non-lowest_vcn 0 extents + due to the nature of lookup_attr() and how we support attribute lists. - Find and fix bugs. - Perhaps don't bother getting the run list in ntfs_read_inode() at |
|
From: Jakob K. <jk...@us...> - 2002-02-27 17:40:24
|
Changes by: jkemi
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv6089
Modified Files:
ldm.c ldm_md.c
Log Message:
ldm_md.c fix
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -U2 -r1.62 -r1.63
--- ldm.c 27 Feb 2002 16:03:58 -0000 1.62
+++ ldm.c 27 Feb 2002 17:40:20 -0000 1.63
@@ -31,5 +31,5 @@
#ifdef CONFIG_LDM_EXPORT_SYMBOLS
-#define static
+# define static
#endif
@@ -42,5 +42,5 @@
u8 n, u8 parts, u8 chunk_s, kdev_t dev);
#else
-# define ldm_md_addpart(a...) do {} while (0)
+# define ldm_md_addpart(...) do {} while (0)
#endif
@@ -60,5 +60,5 @@
#ifndef CONFIG_LDM_DEBUG
-# define ldm_debug(f, a...) do {} while (0)
+# define ldm_debug(...) do {} while (0)
# define DEBUG_ON(x) do {} while (0)
#else
@@ -97,5 +97,5 @@
level = LDM_LVL_NONE;
- printk("%s(%s) (%s @ %d): %s(): %s", prefix[level], label[level],
+ printk("%s(%s) (%s, %d) %s(): %s", prefix[level], label[level],
file, line, function, buf);
}
@@ -153,5 +153,5 @@
return TRUE;
}
-// FIXME: Why doesn't this work ??
+// FIXME: Why doesn't this work ??
/*
static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
Index: ldm_md.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm_md.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- ldm_md.c 9 Feb 2002 18:52:40 -0000 1.5
+++ ldm_md.c 27 Feb 2002 17:40:20 -0000 1.6
@@ -47,31 +47,33 @@
//#define LDM_MD_DEBUG
-#define LDM_MD_MSG_NOMEM "out of memory!\n"
-#define LDM_MD_MSG_CORRUPT "volume data seems inconsistent, bailing out!\n"
+#define LDM_MD_MSG_NOMEM "Out of memory.\n"
+#define LDM_MD_MSG_CORRUPT "Volume data seems inconsistent, bailing out.\n"
// Debug messages
#ifdef LDM_MD_DEBUG
-#define ldm_debug(f, a...) \
- do { \
- printk (KERN_DEBUG "ldm_md %s() @ line %d (DEBUG): ", \
- __FUNCTION__, __LINE__); \
- printk (f, ##a); \
+# define ldm_debug(f, a...) \
+ do { \
+ printk ("%s(ldm_md.c, %d) (DEBUG) %s(): ", \
+ KERN_DEBUG, __LINE__, __func__); \
+ printk (f, ##a); \
} while (0)
#else
-#define ldm_debug(f, a...) do {} while (0)
+# define ldm_debug(...) do {} while (0)
#endif
// Warning messages
-#define ldm_warn(f, a...) \
- do { \
- printk (KERN_WARNING "ldm_md (WARNING): "); \
- printk (f, ##a); \
+#define ldm_warn(f, a...) \
+ do { \
+ printk ("%s(ldm_md.c, %d) (WARNING): %s(): ", \
+ KERN_WARNING, __LINE__, __func__); \
+ printk (f, ##a); \
} while (0)
// Error messages
-#define ldm_err(f, a...) \
- do { \
- printk (KERN_ERR "ldm_md (ERROR): "); \
- printk (f, ##a); \
+#define ldm_err(f, a...) \
+ do { \
+ printk ("%s(ldm_md.c, %d) (ERROR): %s(): ", \
+ KERN_ERR, __LINE__, __func__); \
+ printk (f, ##a); \
} while(0)
@@ -110,6 +112,6 @@
* the initial values. The struct is also added to the volumelist (_vols)
*
- * Return: Pointer Success
- * 0 Error
+ * Return: ptr Success
+ * 0 Error
*/
static _ldm_md_t* _ldm_md_create(const u8* dg_guid, u32 objid,
@@ -160,6 +162,6 @@
* Otherwise the entry is created.
*
- * Return: Pointer Success
- * 0 Error
+ * Return: ptr Success
+ * 0 Error
*/
static _ldm_md_t* _ldm_md_get(const u8* dg_guid, u32 objid,
@@ -180,5 +182,5 @@
return 0;
}
-
+
ldm_debug("id %u t %u n %u !FOUND!\n", objid,
level, parts);
@@ -208,11 +210,10 @@
void ldm_md_destroy(void)
{
- list_t *item;
+ list_t *item, *tmp;
- for(item = _vols.next; item != &_vols; ) {
- _ldm_md_t* v = list_entry(item, _ldm_md_t, list);
- item = item->next;
- kfree(v);
- }
+ list_for_each_safe (item, tmp, &_vols)
+ kfree (list_entry (item, _ldm_md_t, list));
+
+ INIT_LIST_HEAD(&_vols);
}
@@ -274,9 +275,9 @@
void ldm_md_flush(void)
{
- list_t *item;
+ list_t *item, *tmp;
static int minor = CONFIG_LDM_MD_MINOR;
// Scan for complete volumes
- list_for_each(item, &_vols) {
+ list_for_each_safe(item, tmp, &_vols) {
_ldm_md_t* v = list_entry(item, _ldm_md_t, list);
|
|
From: Jakob K. <jk...@us...> - 2002-02-27 17:35:43
|
Changes by: jkemi
Update of /cvsroot/linux-ntfs/dynamic-disk/test
In directory usw-pr-cvs1:/tmp/cvs-serv4246
Modified Files:
dump.c ldminfo.c ldminfo.h
Log Message:
compile fix for new fragments code
Index: dump.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/dump.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- dump.c 17 Feb 2002 22:13:33 -0000 1.10
+++ dump.c 27 Feb 2002 17:35:40 -0000 1.11
@@ -54,5 +54,5 @@
struct vblk_comp *comp = &vb->vblk.comp;
- printf ("0x%06X: [%06X] <Component>\n", vb->sequence, vb->group);
+ printf ("0x%06X: <Component>\n", vb->sequence);
printf (" Name : %s\n", vb->name);
printf (" Object Id : 0x%04llx\n", vb->obj_id);
@@ -67,5 +67,5 @@
struct vblk_part *part = &vb->vblk.part;;
- printf ("0x%06X: [%06X] <Partition>\n", vb->sequence, vb->group);
+ printf ("0x%06X: <Partition>\n", vb->sequence);
printf (" Name : %s\n", vb->name);
printf (" Object Id : 0x%04llx\n", vb->obj_id);
@@ -84,5 +84,5 @@
struct vblk_disk *disk = &vb->vblk.disk;
- printf ("0x%06X: [%06X] <Disk>\n", vb->sequence, vb->group);
+ printf ("0x%06X: <Disk>\n", vb->sequence);
printf (" Name : %s\n", vb->name);
printf (" Object Id : 0x%04llx\n", vb->obj_id);
@@ -101,5 +101,5 @@
struct vblk_dgrp *dgrp = &vb->vblk.dgrp;
- printf ("0x%06X: [%06X] <DiskGroup>\n", vb->sequence, vb->group);
+ printf ("0x%06X: <DiskGroup>\n", vb->sequence);
printf (" Name : %s\n", vb->name);
printf (" Object Id : 0x%04llx\n", vb->obj_id);
@@ -114,5 +114,5 @@
struct vblk_volu *volu = &vb->vblk.volu;
- printf ("0x%06X: [%06X] <Volume>\n", vb->sequence, vb->group);
+ printf ("0x%06X: <Volume>\n", vb->sequence);
printf (" Name : %s\n", vb->name);
printf (" Object Id : 0x%04llx\n", vb->obj_id);
Index: ldminfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- ldminfo.c 23 Feb 2002 16:38:51 -0000 1.22
+++ ldminfo.c 27 Feb 2002 17:35:40 -0000 1.23
@@ -193,5 +193,4 @@
INIT_LIST_HEAD(&ldb.v_comp);
INIT_LIST_HEAD(&ldb.v_part);
- INIT_LIST_HEAD(&ldb.v_extpool);
toc = kmalloc (sizeof (*toc), GFP_KERNEL);
@@ -224,5 +223,4 @@
ldm_free_vblks(&ldb.v_comp);
ldm_free_vblks(&ldb.v_part);
- ldm_free_vblks(&ldb.v_extpool);
free_structs:
kfree (toc);
Index: ldminfo.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/test/ldminfo.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- ldminfo.h 23 Feb 2002 16:38:51 -0000 1.12
+++ ldminfo.h 27 Feb 2002 17:35:40 -0000 1.13
@@ -39,4 +39,9 @@
#endif
+#define LDM_CRIT KERN_CRIT
+#define LDM_ERR KERN_ERR
+#define LDM_INFO KERN_INFO
+#define LDM_DEBUG KERN_DEBUG
+
extern int * hardsect_size[255];
extern int * blk_size [255];
|
|
From: Jakob K. <jk...@us...> - 2002-02-27 16:04:01
|
Changes by: jkemi
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv29845
Modified Files:
ldm.c
Log Message:
changed some error messages
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -U2 -r1.61 -r1.62
--- ldm.c 27 Feb 2002 15:56:09 -0000 1.61
+++ ldm.c 27 Feb 2002 16:03:58 -0000 1.62
@@ -442,5 +442,5 @@
ph[2] = kmalloc (sizeof (*ph[2]), GFP_KERNEL);
if (!ph[1] || !ph[2]) {
- ldm_crit ("Out of memory\n");
+ ldm_crit ("Out of memory.\n");
goto out;
}
@@ -508,5 +508,5 @@
tb[3] = kmalloc (sizeof (*tb[3]), GFP_KERNEL);
if (!tb[1] || !tb[2] || !tb[3]) {
- ldm_crit ("Out of memory\n");
+ ldm_crit ("Out of memory.\n");
goto out;
}
@@ -1298,5 +1298,5 @@
f = kmalloc(sizeof (struct frags) + nrec * size, GFP_KERNEL);
if (!f) {
- ldm_error ("out of memory.\n");
+ ldm_crit ("Out of memory.\n");
return -1;
}
@@ -1360,5 +1360,5 @@
vb = kmalloc (sizeof(struct vblk), GFP_KERNEL);
if (!vb) {
- ldm_error ("out of memory!\n");
+ ldm_crit ("Out of memory.\n");
result = FALSE;
goto out;
@@ -1560,5 +1560,5 @@
ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
if (!toc || !ldb) {
- ldm_crit ("Out of memory\n");
+ ldm_crit ("Out of memory.\n");
goto out;
}
|
|
From: Jakob K. <jk...@us...> - 2002-02-27 15:56:14
|
Changes by: jkemi
Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv25481
Modified Files:
ldm.c ldm.h
Log Message:
Removed left-overs, restored compare_privhead(), new text output macros. Removed all nasty "string " "concatenations".
Index: ldm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -U2 -r1.60 -r1.61
--- ldm.c 24 Feb 2002 21:21:23 -0000 1.60
+++ ldm.c 27 Feb 2002 15:56:09 -0000 1.61
@@ -45,6 +45,5 @@
#endif
-typedef enum
-{
+typedef enum {
FALSE = 0,
TRUE = 1
@@ -59,4 +58,5 @@
* driver was compiled with debug enabled. Otherwise, the call turns into a NOP.
*/
+
#ifndef CONFIG_LDM_DEBUG
# define ldm_debug(f, a...) do {} while (0)
@@ -64,22 +64,40 @@
#else
# define DEBUG_ON BUG_ON
- static void _ldm_debug (const char *file, int line, const char *function,
- const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
-# define ldm_debug(f, a...) \
- _ldm_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a)
+# define ldm_debug(f, a...) \
+ _ldm_printf (LDM_LVL_DEBUG, __FILE__, __LINE__, __func__, f, ##a)
+#endif
+
+#define ldm_crit(f, a...) \
+ _ldm_printf (LDM_LVL_CRIT, __FILE__, __LINE__, __func__, f, ##a)
+
+#define ldm_error(f, a...) \
+ _ldm_printf (LDM_LVL_ERR, __FILE__, __LINE__, __func__, f, ##a)
-static void _ldm_debug (const char *file, int line, const char *function,
- const char *fmt, ...)
+#define ldm_info(f, a...) \
+ _ldm_printf (LDM_LVL_INFO, __FILE__, __LINE__, __func__, f, ##a)
+
+__attribute__ ((format (printf, 5, 6)))
+static void _ldm_printf (unsigned level, const char *file, int line,
+ const char *function, const char *fmt, ...)
{
static char buf[128];
va_list args;
+ static const char *const prefix[] = {
+ KERN_CRIT, KERN_ERR, KERN_INFO, KERN_DEBUG, ""};
+ static const char *const label[] = {
+ "CRITICAL", "ERROR", "INFO", "DEBUG", ""};
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
- printk(LDM_DEBUG "(DEBUG) (%s, %d): %s: %s",
- file, line, function ? function : "", buf);
+
+ // FIXME: is it possible to make __FILE__ less detailed?
+ file = "ldm.c";
+ if (level > LDM_LVL_NONE)
+ level = LDM_LVL_NONE;
+
+ printk("%s(%s) (%s @ %d): %s(): %s", prefix[level], label[level],
+ file, line, function, buf);
}
-#endif
/**
@@ -135,8 +153,9 @@
return TRUE;
}
-/* FIXME: Why doesn't this work ??
+// FIXME: Why doesn't this work ??
+/*
static BOOL ldm_parse_guid (const u8 *src, u8 *dest)
{
- u16 *tmp;
+ u16 *tmp = (u16*)dest;
DEBUG_ON (!src || !dest);
@@ -146,7 +165,8 @@
return FALSE;
- tmp = (u16*) dest;
- return (8 == sscanf (src, "%04hx%04hx-%04hx-%04hx-%04hx-%04hx%04hx%04hx",
- tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5, tmp+6, tmp+7));
+ return (
+ 8 == sscanf (src, "%04hx%04hx-%04hx-%04hx-%04hx-%04hx%04hx%04hx",
+ tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5, tmp+6, tmp+7)
+ );
}
*/
@@ -168,13 +188,14 @@
if (MAGIC_PRIVHEAD != BE64 (data)) {
- printk (LDM_ERR "Cannot find PRIVHEAD structure. LDM database "
- "is corrupt. Aborting.\n");
+ ldm_error ("Cannot find PRIVHEAD structure. LDM database is"
+ " corrupt. Aborting.\n");
return FALSE;
}
+
ph->ver_major = BE16 (data + 0x000C);
ph->ver_minor = BE16 (data + 0x000E);
if ((ph->ver_major != 2) || (ph->ver_minor != 11)) {
- printk (LDM_ERR "Expected PRIVHEAD version %d.%d, got %d.%d. "
- "Aborting.\n", 2, 11, ph->ver_major, ph->ver_minor);
+ ldm_error ("Expected PRIVHEAD version %d.%d, got %d.%d."
+ " Aborting.\n", 2, 11, ph->ver_major, ph->ver_minor);
return FALSE;
}
@@ -183,7 +204,7 @@
if (ph->config_size != LDM_DB_SIZE) { /* 1 MiB in sectors. */
/* Warn the user and continue, carefully */
- printk (LDM_INFO "Database is normally %u bytes, it claims to "
- "be %llu bytes.\n", LDM_DB_SIZE, (unsigned long long)
- ph->config_size);
+ ldm_info ("Database is normally %u bytes, it claims to "
+ "be %llu bytes.\n", LDM_DB_SIZE,
+ (unsigned long long)ph->config_size );
}
ph->logical_disk_start = BE64 (data + 0x011B);
@@ -191,10 +212,10 @@
if ((ph->logical_disk_size == 0) ||
(ph->logical_disk_start + ph->logical_disk_size > ph->config_start)) {
- printk (LDM_ERR "PRIVHEAD disk size doesn't match real disk size\n");
+ ldm_error ("PRIVHEAD disk size doesn't match real disk size\n");
return FALSE;
}
if (!ldm_parse_guid (data + 0x0030, ph->disk_id)) {
- printk (LDM_ERR "PRIVHEAD contains an invalid GUID.\n");
+ ldm_error ("PRIVHEAD contains an invalid GUID.\n");
return FALSE;
}
@@ -225,6 +246,5 @@
if (MAGIC_TOCBLOCK != BE64 (data)) {
- printk (LDM_CRIT "Cannot find TOCBLOCK, database may be "
- "corrupt.\n");
+ ldm_crit ("Cannot find TOCBLOCK, database may be corrupt.\n");
return FALSE;
}
@@ -236,6 +256,6 @@
if (strncmp (toc->bitmap1_name, TOC_BITMAP1,
sizeof (toc->bitmap1_name)) != 0) {
- printk (LDM_CRIT "TOCBLOCK's first bitmap should be '%s', but "
- "is '%s'.\n", TOC_BITMAP1, toc->bitmap1_name);
+ ldm_crit ("TOCBLOCK's first bitmap is '%s', should be '%s'.\n",
+ TOC_BITMAP1, toc->bitmap1_name);
return FALSE;
}
@@ -246,6 +266,6 @@
if (strncmp (toc->bitmap2_name, TOC_BITMAP2,
sizeof (toc->bitmap2_name)) != 0) {
- printk (LDM_CRIT "TOCBLOCK's second bitmap should be '%s', "
- "but is '%s'.\n", TOC_BITMAP2, toc->bitmap2_name);
+ ldm_crit ("TOCBLOCK's second bitmap is '%s', should be '%s'.\n",
+ TOC_BITMAP2, toc->bitmap2_name);
return FALSE;
}
@@ -273,6 +293,5 @@
if (MAGIC_VMDB != BE32 (data)) {
- printk (LDM_CRIT "Cannot find the VMDB, database may be "
- "corrupt.\n");
+ ldm_crit ("Cannot find the VMDB, database may be corrupt.\n");
return FALSE;
}
@@ -280,5 +299,5 @@
vm->ver_minor = BE16 (data + 0x14);
if ((vm->ver_major != 4) || (vm->ver_minor != 10)) {
- printk (LDM_ERR "Expected VMDB version %d.%d, got %d.%d. "
+ ldm_error ("Expected VMDB version %d.%d, got %d.%d. "
"Aborting.\n", 4, 10, vm->ver_major, vm->ver_minor);
return FALSE;
@@ -304,5 +323,4 @@
* FALSE Different
*/
-/*
static BOOL ldm_compare_privheads (const struct privhead *ph1,
const struct privhead *ph2)
@@ -318,10 +336,4 @@
!memcmp(ph1->disk_id, ph2->disk_id, GUID_SIZE));
}
-*/
-static inline BOOL ldm_compare_privheads (const struct privhead *ph1,
- const struct privhead *ph2)
-{
- return (memcmp(ph1, ph2, sizeof(struct privhead)) == 0);
-}
/**
@@ -379,5 +391,5 @@
data = read_dev_sector (bdev, 0, §);
if (!data) {
- printk (LDM_CRIT "Disk read failed.\n");
+ ldm_crit ("Disk read failed.\n");
return FALSE;
}
@@ -430,5 +442,5 @@
ph[2] = kmalloc (sizeof (*ph[2]), GFP_KERNEL);
if (!ph[1] || !ph[2]) {
- printk (LDM_CRIT "Out of memory\n");
+ ldm_crit ("Out of memory\n");
goto out;
}
@@ -443,5 +455,5 @@
first_sector + ph[0]->config_start + off[i], §);
if (!data) {
- printk (LDM_CRIT "Disk read failed.\n");
+ ldm_crit ("Disk read failed.\n");
goto out;
}
@@ -455,5 +467,5 @@
if (!ldm_compare_privheads (ph[0], ph[1]) ||
!ldm_compare_privheads (ph[0], ph[2])) {
- printk (LDM_CRIT "Primary and backup PRIVHEADs don't match.\n");
+ ldm_crit ("Primary and backup PRIVHEADs don't match.\n");
goto out;
}
@@ -496,5 +508,5 @@
tb[3] = kmalloc (sizeof (*tb[3]), GFP_KERNEL);
if (!tb[1] || !tb[2] || !tb[3]) {
- printk (LDM_CRIT "Out of memory\n");
+ ldm_crit ("Out of memory\n");
goto out;
}
@@ -505,5 +517,5 @@
data = read_dev_sector (bdev, base + off[i], §);
if (!data) {
- printk (LDM_CRIT "Disk read failed.\n");
+ ldm_crit ("Disk read failed.\n");
goto out;
}
@@ -518,5 +530,5 @@
!ldm_compare_tocblocks (tb[0], tb[2]) ||
!ldm_compare_tocblocks (tb[0], tb[3])) {
- printk (LDM_CRIT "The TOCBLOCKs don't match.\n");
+ ldm_crit ("The TOCBLOCKs don't match.\n");
goto out;
}
@@ -554,5 +566,5 @@
data = read_dev_sector (bdev, base + OFF_VMDB, §);
if (!data) {
- printk (LDM_CRIT "Disk read failed.\n");
+ ldm_crit ("Disk read failed.\n");
return FALSE;
}
@@ -612,6 +624,5 @@
disk_minor = (minor >> hd->minor_shift) << hd->minor_shift;
if ((start < 1) || ((start + size) > hd->part[disk_minor].nr_sects)) {
- printk (LDM_CRIT "Partition exceeds physical disk. "
- "Aborting.\n");
+ ldm_crit ("Partition exceeds physical disk. Aborting.\n");
return FALSE;
}
@@ -780,5 +791,5 @@
tmp = (tmp << 8) | *block++;
} else {
- printk (LDM_ERR "Illegal length %d.\n", length);
+ ldm_error ("Illegal length %d.\n", length);
}
return tmp;
@@ -810,6 +821,6 @@
length = block[0];
if (length >= buflen) {
- printk (LDM_ERR "String too long for buffer (%d/%d). "
- "Truncating.\n", length, buflen);
+ ldm_error ("String too long for buffer (%d/%d). Truncating.\n",
+ length, buflen);
length = buflen - 1;
}
@@ -961,5 +972,5 @@
sizeof (disk->alt_name));
if (!ldm_parse_guid (buffer + 0x19 + rel_name, disk->disk_id)) {
- printk (LDM_ERR "VBLK DISK contains an invalid GUID.\n");
+ ldm_error ("VBLK DISK contains an invalid GUID.\n");
return FALSE;
}
@@ -1162,5 +1173,5 @@
if (!result)
- printk (LDM_ERR "Failed to parse VBLK 0x%llx (type: 0x%02x).\n",
+ ldm_error ("Failed to parse VBLK 0x%llx (type: 0x%02x).\n",
vb->obj_id, vb->type);
else
@@ -1266,5 +1277,5 @@
/* Sanity check vblk header. */
if (vbh->nrec > FRAG_MAX || vbh->rec >= vbh->nrec) {
- printk (LDM_ERR "Invalid VBLK header.\n");
+ ldm_error ("Invalid VBLK header.\n");
bad = TRUE;
}
@@ -1276,5 +1287,5 @@
bad = TRUE;
else if (vbh->nrec != f->nrec || FRAG_GETMAP(f, vbh->rec)) {
- printk (LDM_ERR "Inconsistent VBLK fragments!\n");
+ ldm_error ("Inconsistent VBLK fragments!\n");
bad = TRUE;
}
@@ -1287,5 +1298,5 @@
f = kmalloc(sizeof (struct frags) + nrec * size, GFP_KERNEL);
if (!f) {
- printk (LDM_ERR "out of memory.\n");
+ ldm_error ("out of memory.\n");
return -1;
}
@@ -1329,7 +1340,4 @@
struct vblk* vb = 0;
BOOL result;
- int count = 0;
-
- ldm_debug("MARKER!!!\n");
list_for_each_safe(item, tmp, list) {
@@ -1343,5 +1351,5 @@
for (i = 0; i < f->nrec; i++)
if (!FRAG_GETMAP(f, i)) {
- printk (LDM_ERR "VBLK group %lu is incomplete.\n",
+ ldm_error ("VBLK group %lu is incomplete.\n",
(unsigned long)f->group);
goto entry_done;
@@ -1352,5 +1360,5 @@
vb = kmalloc (sizeof(struct vblk), GFP_KERNEL);
if (!vb) {
- printk (LDM_ERR "out of memory!\n");
+ ldm_error ("out of memory!\n");
result = FALSE;
goto out;
@@ -1361,5 +1369,4 @@
ldm_ldmdb_add(vb, ldb);
vb = 0;
- count++;
}
/* else - Already logged */
@@ -1374,6 +1381,4 @@
kfree (vb);
- ldm_debug("Parsed %d multipart VBLK records.\n", count);
-
return result;
}
@@ -1417,5 +1422,5 @@
data = read_dev_sector (bdev, base + OFF_VMDB + s, §);
if (!data) {
- printk (LDM_CRIT "Disk read failed in get buffers.\n");
+ ldm_crit ("Disk read failed in get buffers.\n");
goto out;
}
@@ -1428,5 +1433,5 @@
if (!ldm_parse_vblk_head (block, &vbh) ) {
- printk (LDM_ERR "not a VBLK\n");
+ ldm_error ("not a VBLK\n");
goto out;
}
@@ -1446,5 +1451,5 @@
vb = kmalloc (sizeof(struct vblk), GFP_KERNEL);
if (!vb) {
- printk (LDM_CRIT "Out of memory in get vblks.\n");
+ ldm_crit ("Out of memory in get vblks.\n");
goto out;
}
@@ -1555,5 +1560,5 @@
ldb = kmalloc (sizeof (*ldb), GFP_KERNEL);
if (!toc || !ldb) {
- printk (LDM_CRIT "Out of memory\n");
+ ldm_crit ("Out of memory\n");
goto out;
}
@@ -1584,5 +1589,5 @@
if (!ldm_get_vblks (bdev, base, ldb)) {
- printk (LDM_CRIT "get buffers failed\n");
+ ldm_crit ("get buffers failed\n");
goto cleanup;
}
@@ -1590,5 +1595,5 @@
disk = ldm_get_disk_objid (ldb);
if (!disk) {
- printk (LDM_CRIT "can't find this disk\n");
+ ldm_crit ("can't find this disk\n");
goto cleanup;
}
Index: ldm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/ldm.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -U2 -r1.35 -r1.36
--- ldm.h 24 Feb 2002 21:21:23 -0000 1.35
+++ ldm.h 27 Feb 2002 15:56:10 -0000 1.36
@@ -33,8 +33,11 @@
/* Borrowed from kernel.h. */
-#define LDM_CRIT KERN_CRIT __FUNCTION__ "(): " /* critical conditions */
-#define LDM_ERR KERN_ERR __FUNCTION__ "(): " /* error conditions */
-#define LDM_INFO KERN_INFO __FUNCTION__ "(): " /* informative messages */
-#define LDM_DEBUG KERN_DEBUG __FUNCTION__ "(): " /* debug-level messages */
+enum {
+ LDM_LVL_CRIT, /* critical conditions */
+ LDM_LVL_ERR, /* error conditions */
+ LDM_LVL_INFO, /* informative messages */
+ LDM_LVL_DEBUG, /* debug-level messages */
+ LDM_LVL_NONE
+};
/* Magic numbers in CPU format. */
@@ -132,5 +135,5 @@
u64 config_size;
u8 disk_id[GUID_SIZE];
-} __attribute__ ((packed)); /* For memcmp() compare. */
+};
struct tocblock { /* We have exactly two bitmaps. */
|
|
From: Richard R. <fl...@us...> - 2002-02-25 04:30:12
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv28137/scripts
Modified Files:
compat.c rl.c
Log Message:
resync attrib.c, rl.c and check test cases
Index: compat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/compat.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- compat.c 18 Feb 2002 01:53:00 -0000 1.9
+++ compat.c 25 Feb 2002 04:30:08 -0000 1.10
@@ -21,4 +21,8 @@
#include "linux/fs/ntfs/types.h"
+#define SN(X) X /* Struct Name */
+#define SC(P,N) P.N /* ShortCut: Prefix, Name */
+#define _ANR(X) SC(aua.anr,X)
+
#define PAGE_SHIFT 12
#define PAGE_SIZE (1UL << PAGE_SHIFT)
@@ -151,5 +155,5 @@
/* 23 */ s8 reservedR; /* Reserved/alignment to 8-byte
boundary. */
- } __attribute__ ((__packed__));
+ } SN(ara) __attribute__ ((__packed__));
/* Non-resident attributes. */
struct {
@@ -201,7 +205,8 @@
disk space being used on the disk. */
/* sizeof(compressed attr) = 72*/
- } __attribute__ ((__packed__));
- } __attribute__ ((__packed__));
+ } SN(anr) __attribute__ ((__packed__));
+ } SN(aua) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) ATTR_RECORD;
+
typedef enum {
LCN_HOLE = -1, /* Keep this as highest value or die! */
Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/rl.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- rl.c 24 Feb 2002 20:05:18 -0000 1.25
+++ rl.c 25 Feb 2002 04:30:08 -0000 1.26
@@ -544,5 +544,5 @@
/* Make sure attr exists and is non-resident. */
if (!attr || !attr->non_resident ||
- sle64_to_cpu(attr->lowest_vcn) < (VCN)0) {
+ sle64_to_cpu(attr->_ANR(lowest_vcn)) < (VCN)0) {
ntfs_error(vol->sb, "Invalid arguments.");
return ERR_PTR(-EINVAL);
@@ -550,8 +550,8 @@
#endif
/* Start at vcn = lowest_vcn and lcn 0. */
- vcn = sle64_to_cpu(attr->lowest_vcn);
+ vcn = sle64_to_cpu(attr->_ANR(lowest_vcn));
lcn = 0;
/* Get start of the mapping pairs array. */
- buf = (u8*)attr + le16_to_cpu(attr->mapping_pairs_offset);
+ buf = (u8*)attr + le16_to_cpu(attr->_ANR(mapping_pairs_offset));
attr_end = (u8*)attr + le32_to_cpu(attr->length);
if (unlikely(buf < (u8*)attr || buf > attr_end)) {
@@ -679,5 +679,5 @@
* vcn in the run list - 1, or something has gone badly wrong.
*/
- deltaxcn = sle64_to_cpu(attr->highest_vcn);
+ deltaxcn = sle64_to_cpu(attr->_ANR(highest_vcn));
if (unlikely(deltaxcn && vcn - 1 != deltaxcn)) {
mpa_err:
@@ -687,8 +687,8 @@
}
/* Setup not mapped run_list element if this is the base extent. */
- if (!attr->lowest_vcn) {
+ if (!attr->_ANR(lowest_vcn)) {
VCN max_cluster;
- max_cluster = (sle64_to_cpu(attr->allocated_size) +
+ max_cluster = (sle64_to_cpu(attr->_ANR(allocated_size)) +
vol->cluster_size - 1) >>
vol->cluster_size_bits;
@@ -738,60 +738,4 @@
ntfs_free(rl);
return ERR_PTR(-EIO);
-}
-
-/**
- * vcn_to_lcn - convert a vcn into a lcn given a run list
- * @rl: run list to use for conversion
- * @vcn: vcn to convert
- *
- * Convert the virtual cluster number @vcn of an attribute into a logical
- * cluster number (lcn) of a device using the run list @rl to map vcns to their
- * corresponding lcns.
- *
- * Since lcns must be >= 0, we use negative return values with special meaning:
- *
- * Return value Meaning / Description
- * ==================================================
- * -1 = LCN_HOLE Hole / not allocated on disk.
- * -2 = LCN_RL_NOT_MAPPED This is part of the run list which has not been
- * inserted into the run list yet.
- * -3 = LCN_ENOENT There is no such vcn in the data attribute.
- * -4 = LCN_EINVAL Input parameter error (if debug enabled).
- */
-LCN vcn_to_lcn(const run_list *rl, const VCN vcn)
-{
- int i;
-
-#ifdef DEBUG
- if (vcn < (VCN)0)
- return (LCN)LCN_EINVAL;
-#endif
- /*
- * If rl is NULL, assume that we have found an unmapped run list. The
- * caller can then attempt to map it and fail appropriately if
- * necessary.
- */
- if (unlikely(!rl))
- return (LCN)LCN_RL_NOT_MAPPED;
-
- /* Catch out of lower bounds vcn. */
- if (unlikely(vcn < rl[0].vcn))
- return (LCN)LCN_ENOENT;
-
- for (i = 0; likely(rl[i].length); i++) {
- if (unlikely(vcn < rl[i+1].vcn)) {
- if (likely(rl[i].lcn >= (LCN)0))
- return rl[i].lcn + (vcn - rl[i].vcn);
- return rl[i].lcn;
- }
- }
- /*
- * The terminator element is setup to the correct value, i.e. one of
- * LCN_HOLE, LCN_RL_NOT_MAPPED, or LCN_ENOENT.
- */
- if (likely(rl[i].lcn < (LCN)0))
- return rl[i].lcn;
- /* Just in case... We could replace this with BUG() some day. */
- return (LCN)LCN_ENOENT;
}
|
|
From: Richard R. <fl...@us...> - 2002-02-25 04:30:12
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv28137/linux/fs/ntfs
Modified Files:
attrib.c
Log Message:
resync attrib.c, rl.c and check test cases
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -U2 -r1.66 -r1.67
--- attrib.c 25 Feb 2002 04:00:58 -0000 1.66
+++ attrib.c 25 Feb 2002 04:30:08 -0000 1.67
@@ -133,19 +133,22 @@
BUG_ON (!orig || !new);
+ /* First, merge the right hand end, if necesary. */
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
+ /* Space required: Orig size + New size, less one if we merged. */
res = ntfs_rl_realloc (orig, osize, osize + nsize - right);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + 1 + nsize, loc + 1 + right, osize - loc - 1 - right);
rl_mc (res, loc + 1, new, 0, nsize);
+ /* Adjust the size of the preceding hole. */
res[loc].length = res[loc+1].vcn - res[loc].vcn;
- if (!right) {
- if (res[loc+nsize+1].lcn == LCN_ENOENT)
- res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
- }
+ /* We may have changed the length of the file, so fix the end marker */
+ if (res[loc+nsize+1].lcn == LCN_ENOENT)
+ res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
return res;
@@ -179,5 +182,11 @@
BUG_ON (!orig || !new);
- if (loc > 0) {
+ /* disc => Discontinuity between the end of Orig and the start of New.
+ * This means we might need to insert a hole.
+ * hole => Orig ends with a hole or an unmapped region which we can
+ * extend to match the discontinuity. */
+ if (loc == 0) {
+ disc = (new[0].vcn > 0);
+ } else {
left = ntfs_rl_merge (orig + loc - 1, new);
@@ -185,21 +194,17 @@
if (disc)
hole = (orig[loc-1].lcn == LCN_HOLE);
- } else {
- disc = (new[0].vcn > 0);
}
+ /* Space required: Orig size + New size, less one if we merged,
+ * plus one if there was a discontinuity, less one for a trailing hole */
res = ntfs_rl_realloc (orig, osize, osize + nsize - left + disc - hole);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + nsize - left + disc - hole, loc, osize - loc);
rl_mc (res, loc + disc - hole, new, left, nsize - left);
- if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
- (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
- res[loc+nsize-left+disc-hole].length -= (new[nsize-1].vcn +
- new[nsize-1].length - new[0].vcn);
- }
-
+ /* Adjust the VCN of the last run ... */
if (res[loc+nsize-left+disc-hole].lcn <= LCN_HOLE) {
res[loc+nsize-left+disc-hole].vcn =
@@ -207,5 +212,13 @@
res[loc+nsize-left+disc-hole-1].length;
}
+ /* ... and the length. */
+ if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
+ (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
+ res[loc+nsize-left+disc-hole].length =
+ res[loc+nsize-left+disc-hole+1].vcn -
+ res[loc+nsize-left+disc-hole].vcn;
+ }
+ /* Writing beyond the end of the file and there's a discontinuity. */
if (disc) {
if (hole) {
@@ -222,7 +235,5 @@
res[loc].lcn = LCN_RL_NOT_MAPPED;
}
- }
- if (disc) {
if (res[loc+nsize-left+disc].lcn == LCN_ENOENT)
res[loc+nsize-left+disc].vcn = res[loc+nsize-left+disc-1].vcn +
@@ -258,24 +269,24 @@
BUG_ON (!orig || !new);
+ /* First, merge the left and right ends, if necessary. */
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
if (loc > 0)
left = ntfs_rl_merge (orig + loc - 1, new);
+ /* Allocate some space. We'll need less if the left, right
+ * or both ends were merged. */
res = ntfs_rl_realloc (orig, osize, osize + nsize - left - right);
if (IS_ERR (res))
return res;
- rl_mm (res, loc + nsize - left,
- loc + right + 1,
- osize - loc - right - 1);
-
+ /* Move the tail of Orig out of the way, then copy in New. */
+ rl_mm (res, loc + nsize - left, loc + right + 1,
+ osize - loc - right - 1);
rl_mc (res, loc, new, left, nsize - left);
- if (!right) {
- if (res[loc+nsize-left].lcn == LCN_ENOENT)
- res[loc+nsize-left].vcn = res[loc+nsize-left-1].vcn +
- res[loc+nsize-left-1].length;
- }
-
+ /* We may have changed the length of the file, so fix the end marker */
+ if (res[loc+nsize-left].lcn == LCN_ENOENT)
+ res[loc+nsize-left].vcn = res[loc+nsize-left-1].vcn +
+ res[loc+nsize-left-1].length;
return res;
}
@@ -287,5 +298,5 @@
* @new: The run_list to be inserted.
* @nsize: The number of elements in @new (excluding end marker).
- * @loc: Index of run_list @orig to insert @new before.
+ * @loc: Index of run_list in @orig to split with @new.
*
* Split the run_list at @loc into two and insert @new. No merging of
@@ -304,14 +315,17 @@
BUG_ON (!orig || !new);
+ /* Space required: Orig size + New size + One new hole. */
res = ntfs_rl_realloc (orig, osize, osize + nsize + 1);
if (IS_ERR (res))
return res;
+ /* Move the tail of Orig out of the way, then copy in New. */
rl_mm (res, loc + 1 + nsize, loc, osize - loc);
rl_mc (res, loc + 1, new, 0, nsize);
- res[loc].length = res[loc+1].vcn - res[loc].vcn;
- res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
- res[loc+nsize+1].length -= (new[nsize-1].vcn + new[nsize-1].length - new[0].vcn) + res[loc].length;
+ /* Adjust the size of the holes either size of New. */
+ res[loc].length = res[loc+1].vcn - res[loc].vcn;
+ res[loc+nsize+1].vcn = res[loc+nsize].vcn + res[loc+nsize].length;
+ res[loc+nsize+1].length = res[loc+nsize+2].vcn - res[loc+nsize+1].vcn;
return res;
|
|
From: Richard R. <fl...@us...> - 2002-02-25 04:02:10
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv20686
Added Files:
create95 create96
Log Message:
backwards compatibility for gcc 2.95
--- NEW FILE ---
#!/bin/bash
# Take the files in linux/fs/ntfs and pre-process the gcc hacks.
# The output files will be placed in the directory gcc-2.95.
# It will expand the _XXX macros and remove the SN macros.
# The output will be compatible with gcc 2.95 and egcs 2.91.66.
#
# ptr->_ARA(var) becomes ptr->aua.ara.var
#
# struct { becomes struct {
# ... ...
# } SN(name); } name;
#
OUTDIR=gcc-2.95
if [ ! -d ${OUTDIR} ]; then
mkdir ${OUTDIR}
fi
for i in *.[ch]; do
cat $i | grep -v "^#define _[A-Z]\{3\}(X) SC(" |
sed \
-e "s/->_AAH(\([^)]\+\))/->aah.\1/g" \
-e "s/->_ANR(\([^)]\+\))/->aua.anr.\1/g" \
-e "s/->_ARA(\([^)]\+\))/->aua.ara.\1/g" \
-e "s/->_FEA(\([^)]\+\))/->fer.fea.\1/g" \
-e "s/->_FER(\([^)]\+\))/->fer.\1/g" \
-e "s/->_ICF(\([^)]\+\))/->idc.icf.\1/g" \
-e "s/->_IDM(\([^)]\+\))/->idc.idm.\1/g" \
-e "s/->_IEH(\([^)]\+\))/->ieh.\1/g" \
-e "s/->_IEV(\([^)]\+\))/->iif.iev.\1/g" \
-e "s/->_IIF(\([^)]\+\))/->ieh.iif.\1/g" \
-e "s/->_INE(\([^)]\+\))/->ine.\1/g" \
-e "s/->_INR(\([^)]\+\))/->inr.\1/g" \
-e "s/->_IRI(\([^)]\+\))/->key.iri.\1/g" \
-e "s/->_MNR(\([^)]\+\))/->mnr.\1/g" \
-e "s/->_OBV(\([^)]\+\))/->oei.obv.\1/g" \
-e "s/->_SDH(\([^)]\+\))/->sdh.\1/g" \
-e "s/->_SIA(\([^)]\+\))/->sia.\1/g" \
-e "s/->_SVS(\([^)]\+\))/->sei.svs.\1/g" \
-e "s/->_VCL(\([^)]\+\))/->vcl.\1/g" \
-e "s/->_VMM(\([^)]\+\))/->vmm.\1/g" \
-e "s/ SN(\([a-z]\{3\}\))/ \1/" > ${OUTDIR}/$i
done
--- NEW FILE ---
#!/bin/bash
# Take the files in linux/fs/ntfs and pre-process the gcc hacks.
# The output files will be placed in the directory gcc-2.96.
# It will remove the _XXX macros and the SN macros.
# The output will be compatible with gcc 2.96 and above.
#
# ptr->_ARA(var) becomes ptr->var
#
# struct { becomes struct {
# ... ...
# } SN(name); };
#
OUTDIR=gcc-2.96
if [ ! -d ${OUTDIR} ]; then
mkdir ${OUTDIR}
fi
for i in *.[ch]; do
cat $i | sed \
-e "s/->_AAH(\([^)]\+\))/->\1/g" \
-e "s/->_ANR(\([^)]\+\))/->\1/g" \
-e "s/->_ARA(\([^)]\+\))/->\1/g" \
-e "s/->_FEA(\([^)]\+\))/->\1/g" \
-e "s/->_FER(\([^)]\+\))/->\1/g" \
-e "s/->_ICF(\([^)]\+\))/->\1/g" \
-e "s/->_IDM(\([^)]\+\))/->\1/g" \
-e "s/->_IEH(\([^)]\+\))/->\1/g" \
-e "s/->_IEV(\([^)]\+\))/->\1/g" \
-e "s/->_IIF(\([^)]\+\))/->\1/g" \
-e "s/->_INE(\([^)]\+\))/->\1/g" \
-e "s/->_INR(\([^)]\+\))/->\1/g" \
-e "s/->_IRI(\([^)]\+\))/->\1/g" \
-e "s/->_MNR(\([^)]\+\))/->\1/g" \
-e "s/->_OBV(\([^)]\+\))/->\1/g" \
-e "s/->_SDH(\([^)]\+\))/->\1/g" \
-e "s/->_SIA(\([^)]\+\))/->\1/g" \
-e "s/->_SVS(\([^)]\+\))/->\1/g" \
-e "s/->_VCL(\([^)]\+\))/->\1/g" \
-e "s/->_VMM(\([^)]\+\))/->\1/g" \
-e "s/ SN([a-z]\{3\})//" | \
grep -v "^#define _[A-Z]\{3\}(X) SC(" > ${OUTDIR}/$i
done
|
|
From: Richard R. <fl...@us...> - 2002-02-25 04:01:01
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv20133/linux/fs/ntfs
Modified Files:
aops.c attrib.c attrib.h compress.c dir.c inode.c inode.h
layout.h mft.c ntfs.h super.c volume.h
Log Message:
backwards compatibility for gcc 2.95
Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -U2 -r1.53 -r1.54
--- aops.c 14 Feb 2002 06:07:14 -0000 1.53
+++ aops.c 25 Feb 2002 04:00:58 -0000 1.54
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -232,5 +233,5 @@
/* The total length of the attribute value. */
- attr_len = le32_to_cpu(ctx->attr->value_length);
+ attr_len = le32_to_cpu(ctx->attr->_ARA(value_length));
/* Map the page so we can access it. */
@@ -252,5 +253,5 @@
/* Copy the data to the page. */
memcpy(page_addr, attr_pos + (char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset), bytes);
+ le16_to_cpu(ctx->attr->_ARA(value_offset)), bytes);
} else
memset(page_addr, 0, PAGE_CACHE_SIZE);
@@ -339,5 +340,5 @@
blocks = PAGE_CACHE_SIZE >> blocksize_bits;
iblock = page->index << (PAGE_CACHE_SHIFT - blocksize_bits);
- lblock = (((vol->nr_mft_records + 7) >> 3) + blocksize - 1) >>
+ lblock = (((vol->_VMM(nr_mft_records) + 7) >> 3) + blocksize - 1) >>
blocksize_bits;
ntfs_debug("blocks = 0x%x, iblock = 0x%lx, lblock = 0x%lx.", blocks,
@@ -469,5 +470,5 @@
addr = kmap_atomic(page, KM_BIO_IRQ);
- rec_size = ni->index_block_size;
+ rec_size = ni->_IDM(index_block_size);
recs = PAGE_CACHE_SIZE / rec_size;
for (i = 0; i < recs; i++) {
@@ -481,5 +482,5 @@
(long long)((page->index <<
PAGE_CACHE_SHIFT >>
- ni->index_block_size_bits) + i));
+ ni->_IDM(index_block_size_bits)) + i));
}
kunmap_atomic(addr, KM_BIO_IRQ);
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -U2 -r1.65 -r1.66
--- attrib.c 18 Feb 2002 01:53:00 -0000 1.65
+++ attrib.c 25 Feb 2002 04:00:58 -0000 1.66
@@ -3,5 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
- * Copyright (C) 2002 Richard Russon <nt...@fl...>
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -550,5 +550,5 @@
/* Make sure attr exists and is non-resident. */
if (!attr || !attr->non_resident ||
- sle64_to_cpu(attr->lowest_vcn) < (VCN)0) {
+ sle64_to_cpu(attr->_ANR(lowest_vcn)) < (VCN)0) {
ntfs_error(vol->sb, "Invalid arguments.");
return ERR_PTR(-EINVAL);
@@ -556,8 +556,8 @@
#endif
/* Start at vcn = lowest_vcn and lcn 0. */
- vcn = sle64_to_cpu(attr->lowest_vcn);
+ vcn = sle64_to_cpu(attr->_ANR(lowest_vcn));
lcn = 0;
/* Get start of the mapping pairs array. */
- buf = (u8*)attr + le16_to_cpu(attr->mapping_pairs_offset);
+ buf = (u8*)attr + le16_to_cpu(attr->_ANR(mapping_pairs_offset));
attr_end = (u8*)attr + le32_to_cpu(attr->length);
if (unlikely(buf < (u8*)attr || buf > attr_end)) {
@@ -685,5 +685,5 @@
* vcn in the run list - 1, or something has gone badly wrong.
*/
- deltaxcn = sle64_to_cpu(attr->highest_vcn);
+ deltaxcn = sle64_to_cpu(attr->_ANR(highest_vcn));
if (unlikely(deltaxcn && vcn - 1 != deltaxcn)) {
mpa_err:
@@ -693,8 +693,8 @@
}
/* Setup not mapped run_list element if this is the base extent. */
- if (!attr->lowest_vcn) {
+ if (!attr->_ANR(lowest_vcn)) {
VCN max_cluster;
- max_cluster = (sle64_to_cpu(attr->allocated_size) +
+ max_cluster = (sle64_to_cpu(attr->_ANR(allocated_size)) +
vol->cluster_size - 1) >>
vol->cluster_size_bits;
@@ -1012,6 +1012,6 @@
register int rc;
- rc = memcmp(val, (u8*)a +le16_to_cpu(a->value_offset),
- min(val_len, le32_to_cpu(a->value_length)));
+ rc = memcmp(val, (u8*)a +le16_to_cpu(a->_ARA(value_offset)),
+ min(val_len, le32_to_cpu(a->_ARA(value_length))));
/*
* If @val collates before the current attribute's
@@ -1020,5 +1020,5 @@
if (!rc) {
register u32 avl;
- avl = le32_to_cpu(a->value_length);
+ avl = le32_to_cpu(a->_ARA(value_length));
if (val_len == avl)
return TRUE;
@@ -1351,7 +1351,7 @@
* have found it!
*/
- if (!val || (!a->non_resident && le32_to_cpu(a->value_length)
+ if (!val || (!a->non_resident && le32_to_cpu(a->_ARA(value_length))
== val_len && !memcmp((u8*)a +
- le16_to_cpu(a->value_offset), val, val_len))) {
+ le16_to_cpu(a->_ARA(value_offset)), val, val_len))) {
ntfs_debug("Done, found.");
return TRUE;
Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- attrib.h 10 Feb 2002 02:22:58 -0000 1.15
+++ attrib.h 25 Feb 2002 04:00:58 -0000 1.16
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -87,6 +88,6 @@
{
if (!a->non_resident)
- return (s64)le32_to_cpu(a->value_length);
- return sle64_to_cpu(a->data_size);
+ return (s64)le32_to_cpu(a->_ARA(value_length));
+ return sle64_to_cpu(a->_ANR(data_size));
}
Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -U2 -r1.32 -r1.33
--- compress.c 14 Feb 2002 06:07:14 -0000 1.32
+++ compress.c 25 Feb 2002 04:00:58 -0000 1.33
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -448,5 +449,5 @@
struct buffer_head **bhs;
unsigned long offset, index = page->index;
- u32 cb_size = ni->compression_block_size;
+ u32 cb_size = ni->_ICF(compression_block_size);
u64 cb_size_mask = cb_size - 1UL;
VCN vcn;
@@ -463,5 +464,5 @@
/* Number of compression blocks (cbs) in the wanted vcn range. */
unsigned int nr_cbs = (end_vcn - start_vcn) << vol->cluster_size_bits
- >> ni->compression_block_size_bits;
+ >> ni->_ICF(compression_block_size_bits);
/*
* Number of pages required to store the uncompressed data from all
@@ -548,5 +549,5 @@
cur_page = 0;
cur_ofs = 0;
- cb_clusters = ni->compression_block_clusters;
+ cb_clusters = ni->_ICF(compression_block_clusters);
do_next_cb:
nr_cbs--;
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -U2 -r1.46 -r1.47
--- dir.c 14 Feb 2002 01:08:46 -0000 1.46
+++ dir.c 25 Feb 2002 04:00:58 -0000 1.47
@@ -3,4 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -88,5 +89,5 @@
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
/* The first index entry. */
@@ -97,9 +98,9 @@
* reach the last entry.
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
/* Bounds checks. */
if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto dir_err_out;
@@ -108,5 +109,5 @@
* a pointer to a child node in the B+tree so we just break out.
*/
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/*
@@ -133,5 +134,5 @@
vol->upcase, vol->upcase_len)) {
found_it:
- mref = le64_to_cpu(ie->indexed_file);
+ mref = le64_to_cpu(ie->_IIF(indexed_file));
put_attr_search_ctx(ctx);
unmap_mft_record(READ, dir_ni);
@@ -180,5 +181,5 @@
* presence of a child node.
*/
- if (!(ie->flags & INDEX_ENTRY_NODE)) {
+ if (!(ie->_IEH(flags) & INDEX_ENTRY_NODE)) {
/* No child node, return -ENOENT. */
err = -ENOENT;
@@ -195,5 +196,5 @@
}
/* Get the starting vcn of the index_block holding the child node. */
- vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
+ vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->_IEH(length)) - 8);
ia_mapping = VFS_I(dir_ni)->i_mapping;
descend_into_child_node:
@@ -203,5 +204,5 @@
* disk if necessary.
*/
- page = ntfs_map_page(ia_mapping, vcn << dir_ni->index_vcn_size_bits
+ page = ntfs_map_page(ia_mapping, vcn << dir_ni->_IDM(index_vcn_size_bits)
>> PAGE_CACHE_SHIFT);
if (IS_ERR(page)) {
@@ -213,5 +214,5 @@
fast_descend_into_child_node:
/* Get to the index allocation block. */
- ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << dir_ni->index_vcn_size_bits) &
+ ia = (INDEX_ALLOCATION*)(kaddr + ((vcn << dir_ni->_IDM(index_vcn_size_bits)) &
~PAGE_CACHE_MASK));
/* Bounds checks. */
@@ -234,5 +235,5 @@
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
- dir_ni->index_block_size) {
+ dir_ni->_IDM(index_block_size)) {
ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
"has a size (%u) differing from the directory "
@@ -242,9 +243,9 @@
(unsigned long long)dir_ni->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
- dir_ni->index_block_size);
+ dir_ni->_IDM(index_block_size));
err = -EIO;
goto unm_unm_err_out;
}
- index_end = (u8*)ia + dir_ni->index_block_size;
+ index_end = (u8*)ia + dir_ni->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
@@ -257,5 +258,5 @@
}
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
- if (index_end > (u8*)ia + dir_ni->index_block_size) {
+ if (index_end > (u8*)ia + dir_ni->_IDM(index_block_size)) {
ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
"inode %Li exceeds maximum size.",
@@ -273,9 +274,9 @@
* reach the last entry.
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
/* Bounds check. */
if ((u8*)ie < (u8*)ia || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end) {
ntfs_error(sb, "Index entry out of bounds in "
@@ -289,5 +290,5 @@
* a pointer to a child node in the B+tree so we just break out.
*/
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/*
@@ -314,5 +315,5 @@
vol->upcase, vol->upcase_len)) {
found_it2:
- mref = le64_to_cpu(ie->indexed_file);
+ mref = le64_to_cpu(ie->_IIF(indexed_file));
ntfs_unmap_page(page);
put_attr_search_ctx(ctx);
@@ -362,5 +363,5 @@
* the presence of a child node.
*/
- if (ie->flags & INDEX_ENTRY_NODE) {
+ if (ie->_IEH(flags) & INDEX_ENTRY_NODE) {
if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
ntfs_error(sb, "Index entry with child node found in "
@@ -372,5 +373,5 @@
/* Child node present, descend into it. */
old_vcn = vcn;
- vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
+ vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->_IEH(length)) - 8);
if (vcn >= 0) {
/* If vcn is in the same page cache page as old_vcn we
@@ -437,5 +438,5 @@
filp->f_pos = (u8*)ie - (u8*)iu.ia +
(sle64_to_cpu(iu.ia->index_block_vcn) <<
- ndir->index_vcn_size_bits) +
+ ndir->_IDM(index_vcn_size_bits)) +
vol->mft_record_size;
else /* if (index_type == INDEX_TYPE_ROOT) */
@@ -445,5 +446,5 @@
return 0;
}
- if (MREF_LE(ie->indexed_file) == FILE_root) {
+ if (MREF_LE(ie->_IIF(indexed_file)) == FILE_root) {
ntfs_debug("Skipping root directory self reference entry.");
return 0;
@@ -463,8 +464,8 @@
ntfs_debug("Calling filldir for %s with len %i, f_pos 0x%Lx, inode "
"0x%Lx, DT_%s.", name, name_len, filp->f_pos,
- (unsigned long long)MREF_LE(ie->indexed_file),
+ (unsigned long long)MREF_LE(ie->_IIF(indexed_file)),
dt_type == DT_DIR ? "DIR" : "REG");
return filldir(dirent, name, name_len, filp->f_pos,
- (unsigned long)MREF_LE(ie->indexed_file), dt_type);
+ (unsigned long)MREF_LE(ie->_IIF(indexed_file)), dt_type);
}
@@ -559,5 +560,5 @@
/* Get to the index root value (it's been verified in read_inode). */
ir = (INDEX_ROOT*)((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
index_end = (u8*)&ir->index + le32_to_cpu(ir->index.index_length);
/* The first index entry. */
@@ -569,14 +570,14 @@
* or signals an error (both covered by the rc test).
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
ntfs_debug("In index root, offset 0x%x.", (u8*)ie - (u8*)ir);
/* Bounds checks. */
if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto dir_err_out;
/* The last entry cannot contain a name. */
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/* Skip index root entry if continuing previous readdir. */
@@ -617,5 +618,5 @@
goto kf_unm_err_out;
}
- bmp = (u8*)ctx->attr + le16_to_cpu(ctx->attr->value_offset);
+ bmp = (u8*)ctx->attr + le16_to_cpu(ctx->attr->_ARA(value_offset));
}
/* Get the offset into the index allocation attribute. */
@@ -623,9 +624,9 @@
ia_mapping = vdir->i_mapping;
/* If the index block is not in use find the next one that is. */
- bmp_pos = ia_pos >> ndir->index_block_size_bits;
+ bmp_pos = ia_pos >> ndir->_IDM(index_block_size_bits);
page = NULL;
kaddr = NULL;
prev_ia_pos = -1LL;
- if (bmp_pos >> 3 >= ndir->bmp_size) {
+ if (bmp_pos >> 3 >= ndir->_IDM(bmp_size)) {
ntfs_error(sb, "Current index allocation position exceeds "
"index bitmap size.");
@@ -636,7 +637,7 @@
bmp_pos++;
/* If we have reached the end of the bitmap, we are done. */
- if (bmp_pos >> 3 >= ndir->bmp_size)
+ if (bmp_pos >> 3 >= ndir->_IDM(bmp_size))
goto EOD;
- ia_pos = (s64)bmp_pos << ndir->index_block_size_bits;
+ ia_pos = (s64)bmp_pos << ndir->_IDM(index_block_size_bits);
}
ntfs_debug("Handling index buffer 0x%x.", bmp_pos);
@@ -657,5 +658,5 @@
/* Get the current index buffer. */
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
- ~(s64)(ndir->index_block_size - 1)));
+ ~(s64)(ndir->_IDM(index_block_size) - 1)));
/* Bounds checks. */
if ((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE) {
@@ -667,6 +668,6 @@
}
if (sle64_to_cpu(ia->index_block_vcn) != (ia_pos &
- ~(s64)(ndir->index_block_size - 1)) >>
- ndir->index_vcn_size_bits) {
+ ~(s64)(ndir->_IDM(index_block_size) - 1)) >>
+ ndir->_IDM(index_vcn_size_bits)) {
ntfs_error(sb, "Actual VCN (%Li) of index buffer is "
"different from expected VCN (%Li). "
@@ -674,5 +675,5 @@
"driver bug. ",
(long long)sle64_to_cpu(ia->index_block_vcn),
- (long long)ia_pos >> ndir->index_vcn_size_bits,
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -680,17 +681,17 @@
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 !=
- ndir->index_block_size) {
+ ndir->_IDM(index_block_size)) {
ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
"has a size (%u) differing from the directory "
"specified size (%u). Directory inode is "
"corrupt or driver bug.", (long long)ia_pos >>
- ndir->index_vcn_size_bits,
+ ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no,
le32_to_cpu(ia->index.allocated_size) + 0x18,
- ndir->index_block_size);
+ ndir->_IDM(index_block_size));
err = -EIO;
goto unm_dir_err_out;
}
- index_end = (u8*)ia + ndir->index_block_size;
+ index_end = (u8*)ia + ndir->_IDM(index_block_size);
if (index_end > kaddr + PAGE_CACHE_SIZE) {
ntfs_error(sb, "Index buffer (VCN %Li) of directory inode %Li "
@@ -698,15 +699,15 @@
"access! This is probably a bug in the "
"driver.", (long long)ia_pos >>
- ndir->index_vcn_size_bits,
+ ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
goto unm_dir_err_out;
}
- ia_start = ia_pos & ~(s64)(ndir->index_block_size - 1);
+ ia_start = ia_pos & ~(s64)(ndir->_IDM(index_block_size) - 1);
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
- if (index_end > (u8*)ia + ndir->index_block_size) {
+ if (index_end > (u8*)ia + ndir->_IDM(index_block_size)) {
ntfs_error(sb, "Size of index buffer (VCN %Li) of directory "
"inode %Li exceeds maximum size.",
- (long long)ia_pos >> ndir->index_vcn_size_bits,
+ (long long)ia_pos >> ndir->_IDM(index_vcn_size_bits),
(unsigned long long)ndir->mft_no);
err = -EIO;
@@ -721,5 +722,5 @@
* or signals an error (both covered by the rc test).
*/
- for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
+ for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->_IEH(length)))) {
ntfs_debug("In index allocation, offset 0x%Lx.",
(long long)ia_start + ((u8*)ie - (u8*)ia));
@@ -727,9 +728,9 @@
if ((u8*)ie < (u8*)ia || (u8*)ie +
sizeof(INDEX_ENTRY_HEADER) > index_end ||
- (u8*)ie + le16_to_cpu(ie->key_length) >
+ (u8*)ie + le16_to_cpu(ie->_IEH(key_length)) >
index_end)
goto unm_dir_err_out;
/* The last entry cannot contain a name. */
- if (ie->flags & INDEX_ENTRY_END)
+ if (ie->_IEH(flags) & INDEX_ENTRY_END)
break;
/* Skip index block entry if continuing previous readdir. */
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -U2 -r1.68 -r1.69
--- inode.c 14 Feb 2002 06:07:14 -0000 1.68
+++ inode.c 25 Feb 2002 04:00:58 -0000 1.69
@@ -3,4 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -84,7 +85,7 @@
ni->attr_list = NULL;
ni->attr_list_rl = NULL;
- ni->bmp_rl = NULL;
+ ni->_IDM(bmp_rl) = NULL;
init_MUTEX(&ni->extent_lock);
- ni->base_ntfs_ino = NULL;
+ ni->_INE(base_ntfs_ino) = NULL;
ni->vol = NTFS_SB(sb);
return;
@@ -164,5 +165,5 @@
return -EIO;
}
- if (!(attr->resident_flags & RESIDENT_ATTR_IS_INDEXED)) {
+ if (!(attr->_ARA(resident_flags) & RESIDENT_ATTR_IS_INDEXED)) {
ntfs_error(ctx->ntfs_ino->vol->sb, "Unindexed file "
"name. You should run chkdsk.");
@@ -170,6 +171,6 @@
}
file_name_attr = (FILE_NAME_ATTR*)((u8*)attr +
- le16_to_cpu(attr->value_offset));
- p2 = (u8*)attr + le32_to_cpu(attr->value_length);
+ le16_to_cpu(attr->_ARA(value_offset)));
+ p2 = (u8*)attr + le32_to_cpu(attr->_ARA(value_length));
if (p2 < (u8*)attr || p2 > p)
goto err_corrupt_attr;
@@ -321,5 +322,5 @@
/* Get the standard information attribute value. */
si = (STANDARD_INFORMATION*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
/* Transfer information from the standard information into vfs_ino. */
@@ -398,6 +399,6 @@
} else /* if (!ctx.attr->non_resident) */ {
if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset) +
- le32_to_cpu(ctx->attr->value_length) >
+ le16_to_cpu(ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(vi->i_sb, "Corrupt attribute list "
@@ -407,6 +408,6 @@
/* Now copy the attribute list. */
memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset),
- le32_to_cpu(ctx->attr->value_length));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(ctx->attr->_ARA(value_length)));
}
}
@@ -453,6 +454,6 @@
}
ir = (INDEX_ROOT*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
- ir_end = (char*)ir + le32_to_cpu(ctx->attr->value_length);
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
+ ir_end = (char*)ir + le32_to_cpu(ctx->attr->_ARA(value_length));
if (ir_end > (char*)ctx->mrec + vol->mft_record_size) {
ntfs_error(vi->i_sb, "$INDEX_ROOT attribute is "
@@ -477,35 +478,35 @@
goto put_unm_err_out;
}
- ni->index_block_size = le32_to_cpu(ir->index_block_size);
- if (ni->index_block_size & (ni->index_block_size - 1)) {
+ ni->_IDM(index_block_size) = le32_to_cpu(ir->index_block_size);
+ if (ni->_IDM(index_block_size) & (ni->_IDM(index_block_size) - 1)) {
ntfs_error(vi->i_sb, "Index block size (%u) is not a "
- "power of two.", ni->index_block_size);
+ "power of two.", ni->_IDM(index_block_size));
goto put_unm_err_out;
}
- if (ni->index_block_size > PAGE_CACHE_SIZE) {
+ if (ni->_IDM(index_block_size) > PAGE_CACHE_SIZE) {
ntfs_error(vi->i_sb, "Index block size (%u) > "
"PAGE_CACHE_SIZE (%ld) is not "
"supported. Sorry.",
- ni->index_block_size,
+ ni->_IDM(index_block_size),
PAGE_CACHE_SIZE);
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- if (ni->index_block_size < NTFS_BLOCK_SIZE) {
+ if (ni->_IDM(index_block_size) < NTFS_BLOCK_SIZE) {
ntfs_error(vi->i_sb, "Index block size (%u) < "
"NTFS_BLOCK_SIZE (%i) is not "
"supported. Sorry.",
- ni->index_block_size, NTFS_BLOCK_SIZE);
+ ni->_IDM(index_block_size), NTFS_BLOCK_SIZE);
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->index_block_size_bits = ffs(ni->index_block_size) - 1;
+ ni->_IDM(index_block_size_bits) = ffs(ni->_IDM(index_block_size)) - 1;
/* Determine the size of a vcn in the directory index. */
- if (vol->cluster_size <= ni->index_block_size) {
- ni->index_vcn_size = vol->cluster_size;
- ni->index_vcn_size_bits = vol->cluster_size_bits;
+ if (vol->cluster_size <= ni->_IDM(index_block_size)) {
+ ni->_IDM(index_vcn_size) = vol->cluster_size;
+ ni->_IDM(index_vcn_size_bits) = vol->cluster_size_bits;
} else {
- ni->index_vcn_size = vol->sector_size;
- ni->index_vcn_size_bits = vol->sector_size_bits;
+ ni->_IDM(index_vcn_size) = vol->sector_size;
+ ni->_IDM(index_vcn_size_bits) = vol->sector_size_bits;
}
if (!(ir->index.flags & LARGE_INDEX)) {
@@ -539,8 +540,8 @@
goto put_unm_err_out;
}
- if (!sle64_to_cpu(ctx->attr->lowest_vcn)) {
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ if (!sle64_to_cpu(ctx->attr->_ANR(lowest_vcn))) {
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
+ ctx->attr->_ANR(initialized_size));
} else
/*
@@ -552,5 +553,5 @@
*/
vi->i_size = ni->initialized_size =
- sle64_to_cpu(ctx->attr->highest_vcn)
+ sle64_to_cpu(ctx->attr->_ANR(highest_vcn))
<< vol->cluster_size_bits;
/* Setup the run list. */
@@ -579,7 +580,7 @@
if (ctx->attr->non_resident) {
ni->state |= 1 << NI_BmpNonResident;
- if (!sle64_to_cpu(ctx->attr->lowest_vcn))
- ni->bmp_size = sle64_to_cpu(
- ctx->attr->data_size);
+ if (!sle64_to_cpu(ctx->attr->_ANR(lowest_vcn)))
+ ni->_IDM(bmp_size) = sle64_to_cpu(
+ ctx->attr->_ANR(data_size));
else
/*
@@ -590,13 +591,13 @@
* ridiculously big / very fragmented or sparse.
*/
- ni->bmp_size = sle64_to_cpu(
- ctx->attr->highest_vcn)
+ ni->_IDM(bmp_size) = sle64_to_cpu(
+ ctx->attr->_ANR(highest_vcn))
<< vol->cluster_size_bits;
/* Setup the run list. */
- ni->bmp_rl = decompress_mapping_pairs(vol, ctx->attr,
+ ni->_IDM(bmp_rl) = decompress_mapping_pairs(vol, ctx->attr,
NULL);
- if (IS_ERR(ni->bmp_rl)) {
- err = PTR_ERR(ni->bmp_rl);
- ni->bmp_rl = NULL;
+ if (IS_ERR(ni->_IDM(bmp_rl))) {
+ err = PTR_ERR(ni->_IDM(bmp_rl));
+ ni->_IDM(bmp_rl) = NULL;
ntfs_error(vi->i_sb, "Mapping pairs "
"decompression failed with "
@@ -605,11 +606,11 @@
}
} else
- ni->bmp_size = le32_to_cpu(ctx->attr->value_length);
+ ni->_IDM(bmp_size) = le32_to_cpu(ctx->attr->_ARA(value_length));
/* Consistency check bitmap size vs. index allocation size. */
- if (ni->bmp_size << 3 < ni->initialized_size >>
- ni->index_block_size_bits) {
+ if (ni->_IDM(bmp_size) << 3 < ni->initialized_size >>
+ ni->_IDM(index_block_size_bits)) {
ntfs_error(vi->i_sb, "$I30 bitmap too small (0x%Lx) "
"for index allocation (0x%Lx).",
- (long long)ni->bmp_size << 3,
+ (long long)ni->_IDM(bmp_size) << 3,
(long long)ni->initialized_size);
goto put_unm_err_out;
@@ -678,7 +679,7 @@
goto put_unm_err_out;
}
- ni->compression_block_clusters = 1U <<
- ctx->attr->compression_unit;
- if (ctx->attr->compression_unit != 4) {
+ ni->_ICF(compression_block_clusters) = 1U <<
+ ctx->attr->_ANR(compression_unit);
+ if (ctx->attr->_ANR(compression_unit) != 4) {
ntfs_error(vi->i_sb, "Found "
"nonstandard compression unit "
@@ -687,13 +688,13 @@
"indicate corruption so you "
"should run chkdsk.",
- ctx->attr->compression_unit);
+ ctx->attr->_ANR(compression_unit));
err = -EOPNOTSUPP;
goto ec_put_unm_err_out;
}
- ni->compression_block_size = 1U <<
- (ctx->attr->compression_unit +
+ ni->_ICF(compression_block_size) = 1U <<
+ (ctx->attr->_ANR(compression_unit) +
vol->cluster_size_bits);
- ni->compression_block_size_bits = ffs(
- ni->compression_block_size) - 1;
+ ni->_ICF(compression_block_size_bits) = ffs(
+ ni->_ICF(compression_block_size)) - 1;
}
if (ctx->attr->flags & ATTR_IS_ENCRYPTED) {
@@ -719,5 +720,5 @@
}
}
- if (sle64_to_cpu(ctx->attr->lowest_vcn))
+ if (sle64_to_cpu(ctx->attr->_ANR(lowest_vcn)))
/*
* Just a rough guess as ->*_size are not
@@ -730,13 +731,13 @@
vi->i_size = ni->initialized_size =
sle64_to_cpu(
- ctx->attr->highest_vcn) <<
+ ctx->attr->_ANR(highest_vcn)) <<
vol->cluster_size_bits;
else {
- vi->i_size = sle64_to_cpu(ctx->attr->data_size);
+ vi->i_size = sle64_to_cpu(ctx->attr->_ANR(data_size));
ni->initialized_size = sle64_to_cpu(
- ctx->attr->initialized_size);
+ ctx->attr->_ANR(initialized_size));
}
} else { /* Resident attribute. */
- vi->i_size = le32_to_cpu(ctx->attr->value_length);
+ vi->i_size = le32_to_cpu(ctx->attr->_ARA(value_length));
ni->initialized_size = 0LL;
}
@@ -834,6 +835,6 @@
* completion handler for directories.
*/
- ni->index_block_size = vol->mft_record_size;
- ni->index_block_size_bits = vol->mft_record_size_bits;
+ ni->_IDM(index_block_size) = vol->mft_record_size;
+ ni->_IDM(index_block_size_bits) = vol->mft_record_size_bits;
/* Very important! Needed to be able to call map_mft_record*(). */
@@ -937,6 +938,6 @@
} else /* if (!ctx.attr->non_resident) */ {
if ((u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset) +
- le32_to_cpu(ctx->attr->value_length) >
+ le16_to_cpu(ctx->attr->_ARA(value_offset)) +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) >
(u8*)ctx->mrec + vol->mft_record_size) {
ntfs_error(sb, "Corrupt attribute list "
@@ -946,6 +947,6 @@
/* Now copy the attribute list. */
memcpy(ni->attr_list, (u8*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset),
- le32_to_cpu(ctx->attr->value_length));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)),
+ le32_to_cpu(ctx->attr->_ARA(value_length)));
}
/* The attribute list is now setup in memory. */
@@ -1051,12 +1052,12 @@
if (!next_vcn) {
/* Get the last vcn in the $DATA attribute. */
- last_vcn = sle64_to_cpu(attr->allocated_size) >>
+ last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
vol->cluster_size_bits;
/* Fill in the inode size. */
- vi->i_size = sle64_to_cpu(attr->data_size);
+ vi->i_size = sle64_to_cpu(attr->_ANR(data_size));
ni->initialized_size =
- sle64_to_cpu(attr->initialized_size);
+ sle64_to_cpu(attr->_ANR(initialized_size));
/* Set the number of mft records. */
- vol->nr_mft_records = vi->i_size >>
+ vol->_VMM(nr_mft_records) = vi->i_size >>
vol->mft_record_size_bits;
/*
@@ -1114,5 +1115,5 @@
/* Get the lowest vcn for the next extent. */
- highest_vcn = sle64_to_cpu(attr->highest_vcn);
+ highest_vcn = sle64_to_cpu(attr->_ANR(highest_vcn));
next_vcn = highest_vcn + 1;
@@ -1122,5 +1123,5 @@
/* Avoid endless loops due to corruption. */
- if (next_vcn < sle64_to_cpu(attr->lowest_vcn)) {
+ if (next_vcn < sle64_to_cpu(attr->_ANR(lowest_vcn))) {
ntfs_error(sb, "$MFT has corrupt attribute list "
"attribute. Run chkdsk.");
@@ -1233,6 +1234,6 @@
// FIXME: Handle dirty case for each extent inode!
for (i = 0; i < ni->nr_extents; i++)
- ntfs_destroy_inode(ni->extent_ntfs_inos[i]);
- kfree(ni->extent_ntfs_inos);
+ ntfs_destroy_inode(ni->_INE(extent_ntfs_inos)[i]);
+ kfree(ni->_INE(extent_ntfs_inos));
}
/* Free all alocated memory. */
@@ -1267,5 +1268,5 @@
if (S_ISDIR(vi->i_mode))
- ntfs_free(ni->bmp_rl);
+ ntfs_free(ni->_IDM(bmp_rl));
return;
}
Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- inode.h 14 Feb 2002 06:07:14 -0000 1.15
+++ inode.h 25 Feb 2002 04:00:58 -0000 1.16
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -80,5 +81,5 @@
run_list *bmp_rl; /* Run list for the $I30 bitmap
if it is non-resident. */
- };
+ } SN(idm);
struct { /* It is a compressed file. */
u32 compression_block_size; /* Size of a compression
@@ -89,6 +90,6 @@
per compression
block. */
- };
- };
+ } SN(icf);
+ } SN(idc);
struct semaphore extent_lock; /* Lock for accessing/modifying the
below . */
@@ -104,6 +105,10 @@
vfs inode of the base mft
record. */
- };
+ } SN(ine);
};
+
+#define _IDM(X) SC(idc.idm,X)
+#define _ICF(X) SC(idc.icf,X)
+#define _INE(X) SC(ine,X)
typedef struct {
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/layout.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- layout.h 3 Feb 2002 19:31:17 -0000 1.10
+++ layout.h 25 Feb 2002 04:00:58 -0000 1.11
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -286,5 +287,5 @@
typedef struct {
/*Ofs*/
-/* 0*/ NTFS_RECORD; /* Usually the magic is "FILE". */
+/* 0*/ NTFS_RECORD SN(mnr); /* Usually the magic is "FILE". */
/* 8*/ u64 lsn; /* $LogFile sequence number for this record.
Changed every time the record is modified. */
@@ -350,4 +351,6 @@
} __attribute__ ((__packed__)) MFT_RECORD;
+#define _MNR(X) SC(mnr,X)
+
/*
* System defined attributes (32-bit). Each attribute type has a corresponding
@@ -603,5 +606,5 @@
/* 23 */ s8 reservedR; /* Reserved/alignment to 8-byte
boundary. */
- } __attribute__ ((__packed__));
+ } SN(ara) __attribute__ ((__packed__));
/* Non-resident attributes. */
struct {
@@ -653,8 +656,11 @@
disk space being used on the disk. */
/* sizeof(compressed attr) = 72*/
- } __attribute__ ((__packed__));
- } __attribute__ ((__packed__));
+ } SN(anr) __attribute__ ((__packed__));
+ } SN(aua) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) ATTR_RECORD;
+#define _ARA(X) SC(aua.ara,X)
+#define _ANR(X) SC(aua.anr,X)
+
typedef ATTR_RECORD ATTR_REC;
@@ -803,9 +809,11 @@
journal is a very fast process, so the user
won't even notice it. */
- };
- };
+ } SN(svs);
+ } SN(sei);
/* sizeof() = 72 bytes (NTFS 3.0) */
} __attribute__ ((__packed__)) STANDARD_INFORMATION;
+#define _SVS(X) SC(sei.svs,X)
+
/*
* Attribute: Attribute list (0x20).
@@ -940,10 +948,10 @@
(EAs), if such are present.*/
/* 3e*/ u16 reserved; /* Reserved for alignment. */
- } __attribute__ ((__packed__));
+ } SN(fea) __attribute__ ((__packed__));
/* 3c*/ u32 reparse_point_tag; /* Type of reparse point,
present only in reparse
points and only if there are
no EAs. */
- } __attribute__ ((__packed__));
+ } SN(fer) __attribute__ ((__packed__));
/* 40*/ u8 file_name_length; /* Length of file name in
(Unicode) characters. */
@@ -952,4 +960,7 @@
} __attribute__ ((__packed__)) FILE_NAME_ATTR;
+#define _FEA(X) SC(fer.fea,X)
+#define _FER(X) SC(fer,X)
+
/*
* GUID structures store globally unique identifiers (GUID). A GUID is a
@@ -989,7 +1000,7 @@
GUID birth_object_id;
GUID domain_id;
- } __attribute__ ((__packed__));
+ } SN(obv) __attribute__ ((__packed__));
u8 extended_info[48];
- } __attribute__ ((__packed__));
+ } SN(oei) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) OBJ_ID_INDEX_DATA;
@@ -1013,9 +1024,11 @@
first created. */
GUID domain_id; /* Reserved, zero. */
- } __attribute__ ((__packed__));
+ } SN(obv) __attribute__ ((__packed__));
u8 extended_info[48];
- } __attribute__ ((__packed__));
+ } SN(oei) __attribute__ ((__packed__));
} __attribute__ ((__packed__)) OBJECT_ID_ATTR;
+#define _OBV(X) SC(oei.obv,X)
+
/*
* The pre-defined IDENTIFIER_AUTHORITIES used as SID_IDENTIFIER_AUTHORITY in
@@ -1155,8 +1168,10 @@
u32 low_part; /* Low 32-bits. */
u16 high_part; /* High 16-bits. */
- } __attribute__ ((__packed__));
+ } SN(sia) __attribute__ ((__packed__));
u8 value[6]; /* Value as individual bytes. */
} __attribute__ ((__packed__)) SID_IDENTIFIER_AUTHORITY;
+#define _SIA(X) SC(sia,X)
+
/*
* The SID structure is a variable-length structure used to uniquely identify
@@ -1423,9 +1438,10 @@
*/
typedef struct {
- ACE_HEADER; /* The ACE header. */
+ ACE_HEADER SN(aah); /* The ACE header. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
SID sid; /* The SID associated with the ACE. */
} __attribute__ ((__packed__)) ACCESS_ALLOWED_ACE, ACCESS_DENIED_ACE,
SYSTEM_AUDIT_ACE, SYSTEM_ALARM_ACE;
+#define _AAH(X) SC(aah,X)
/*
@@ -1438,5 +1454,5 @@
typedef struct {
- ACE_HEADER; /* The ACE_HEADER. */
+ ACE_HEADER SN(aah); /* The ACE_HEADER. */
ACCESS_MASK mask; /* Access mask associated with the ACE. */
OBJECT_ACE_FLAGS flags; /* Flags describing the object ACE. */
@@ -1687,9 +1703,11 @@
*/
typedef struct {
- SECURITY_DESCRIPTOR_HEADER; /* The security descriptor header. */
+ SECURITY_DESCRIPTOR_HEADER SN(sdh); /* The security descriptor header. */
SECURITY_DESCRIPTOR_RELATIVE sid; /* The self-relative security
descriptor. */
} __attribute__ ((__packed__)) SDS_ENTRY;
+#define _SDH(X) SC(sdh,X)
+
/*
* The index entry key used in the $SII index. The collation type is
@@ -1862,5 +1880,5 @@
*/
typedef struct {
-/* 0*/ NTFS_RECORD; /* Magic is "INDX". */
+/* 0*/ NTFS_RECORD SN(inr); /* Magic is "INDX". */
/* 8*/ s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
@@ -1883,4 +1901,6 @@
} __attribute__ ((__packed__)) INDEX_BLOCK;
+#define _INR(X) SC(inr,X)
+
typedef INDEX_BLOCK INDEX_ALLOCATION;
@@ -1997,6 +2017,6 @@
u16 data_length; /* Data length in bytes. */
u32 reservedV; /* Reserved (zero). */
- } __attribute__ ((__packed__));
- } __attribute__ ((__packed__));
+ } SN(iev) __attribute__ ((__packed__));
+ } SN(iif) __attribute__ ((__packed__));
/* 8*/ u16 length; /* Byte size of this index entry, multiple of
8-bytes. */
@@ -2009,4 +2029,7 @@
} __attribute__ ((__packed__)) INDEX_ENTRY_HEADER;
+#define _IIF(X) SC(ieh.iif,X)
+#define _IEV(X) SC(iif.iev,X)
+
/*
* This is an index entry. A sequence of such entries follows each INDEX_HEADER
@@ -2017,5 +2040,5 @@
*/
typedef struct {
-/* 0*/ INDEX_ENTRY_HEADER; /* The index entry header (see above). */
+/* 0*/ INDEX_ENTRY_HEADER SN(ieh); /* The index entry header (see above). */
/* 16*/ union { /* The key of the indexed attribute. NOTE: Only present
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
@@ -2029,5 +2052,5 @@
object_id of the mft record found in
the data part of the index. */
- REPARSE_INDEX_KEY; /* $R index in FILE_Extend/$Reparse. */
+ REPARSE_INDEX_KEY SN(iri); /* $R index in FILE_Extend/$Reparse. */
SID sid; /* $O index in FILE_Extend/$Quota:
SID of the owner of the user_id. */
@@ -2051,4 +2074,7 @@
// where sizeof(VCN) can be hardcoded as 8 if wanted. */
} __attribute__ ((__packed__)) INDEX_ENTRY;
+
+#define _IEH(X) SC(ieh,X)
+#define _IRI(X) SC(key.iri,X)
/*
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -U2 -r1.49 -r1.50
--- mft.c 14 Feb 2002 06:07:14 -0000 1.49
+++ mft.c 25 Feb 2002 04:00:58 -0000 1.50
@@ -3,4 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -42,8 +43,8 @@
memset(m, 0, size);
- m->magic = magic_FILE;
+ m->_MNR(magic) = magic_FILE;
/* Aligned to 2-byte boundary. */
- m->usa_ofs = cpu_to_le16((sizeof(MFT_RECORD) + 1) & ~1);
- m->usa_count = cpu_to_le16(size / NTFS_BLOCK_SIZE + 1);
+ m->_MNR(usa_ofs) = cpu_to_le16((sizeof(MFT_RECORD) + 1) & ~1);
+ m->_MNR(usa_count) = cpu_to_le16(size / NTFS_BLOCK_SIZE + 1);
/* Set the update sequence number to 1. */
*(u16*)((char*)m + ((sizeof(MFT_RECORD) + 1) & ~1)) = cpu_to_le16(1);
@@ -52,6 +53,6 @@
m->link_count = cpu_to_le16(0);
/* Aligned to 8-byte boundary. */
- m->attrs_offset = cpu_to_le16((le16_to_cpu(m->usa_ofs) +
- (le16_to_cpu(m->usa_count) << 1) + 7) & ~7);
+ m->attrs_offset = cpu_to_le16((le16_to_cpu(m->_MNR(usa_ofs)) +
+ (le16_to_cpu(m->_MNR(usa_count)) << 1) + 7) & ~7);
m->flags = cpu_to_le16(0);
/*
@@ -614,5 +615,5 @@
down(&base_ni->extent_lock);
if (base_ni->nr_extents > 0) {
- extent_nis = base_ni->extent_ntfs_inos;
+ extent_nis = base_ni->_INE(extent_ntfs_inos);
for (i = 0; i < base_ni->nr_extents; i++) {
if (mft_no != extent_nis[i]->mft_no)
@@ -660,5 +661,5 @@
ni->seq_no = seq_no;
ni->nr_extents = -1;
- ni->base_ntfs_ino = base_ni;
+ ni->_INE(base_ntfs_ino) = base_ni;
/* Now map the record. */
m = map_mft_record(READ, ni);
@@ -690,12 +691,12 @@
goto unm_err_out;
}
- if (base_ni->extent_ntfs_inos) {
- memcpy(tmp, base_ni->extent_ntfs_inos, new_size -
+ if (base_ni->_INE(extent_ntfs_inos)) {
+ memcpy(tmp, base_ni->_INE(extent_ntfs_inos), new_size -
4 * sizeof(ntfs_inode *));
- kfree(base_ni->extent_ntfs_inos);
+ kfree(base_ni->_INE(extent_ntfs_inos));
}
- base_ni->extent_ntfs_inos = tmp;
+ base_ni->_INE(extent_ntfs_inos) = tmp;
}
- base_ni->extent_ntfs_inos[base_ni->nr_extents++] = ni;
+ base_ni->_INE(extent_ntfs_inos)[base_ni->nr_extents++] = ni;
up(&base_ni->extent_lock);
atomic_dec(&base_ni->count);
Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- ntfs.h 8 Feb 2002 05:17:11 -0000 1.29
+++ ntfs.h 25 Feb 2002 04:00:58 -0000 1.30
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -25,7 +26,9 @@
/* Make sure gcc-2.96 or higher is being used. */
+/*
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
# error The NTFS driver can only be compiled with gcc-2.96 or later.
#endif
+*/
#include <linux/version.h>
Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -U2 -r1.77 -r1.78
--- super.c 25 Feb 2002 02:49:33 -0000 1.77
+++ super.c 25 Feb 2002 04:00:58 -0000 1.78
@@ -3,5 +3,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
- * Copyright (C) 2001 Richard Russon.
+ * Copyright (C) 2001,2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -561,8 +561,8 @@
return FALSE;
}
- vol->nr_clusters = ll;
- ntfs_debug("vol->nr_clusters = 0x%Lx", (long long)vol->nr_clusters);
+ vol->_VCL(nr_clusters) = ll;
+ ntfs_debug("vol->_VCL(nr_clusters) = 0x%Lx", (long long)vol->_VCL(nr_clusters));
ll = sle64_to_cpu(b->mft_lcn);
- if (ll >= vol->nr_clusters) {
+ if (ll >= vol->_VCL(nr_clusters)) {
ntfs_error(vol->sb, "MFT LCN is beyond end of volume. Weird.");
return FALSE;
@@ -571,5 +571,5 @@
ntfs_debug("vol->mft_lcn = 0x%Lx", (long long)vol->mft_lcn);
ll = sle64_to_cpu(b->mftmirr_lcn);
- if (ll >= vol->nr_clusters) {
+ if (ll >= vol->_VCL(nr_clusters)) {
ntfs_error(vol->sb, "MFTMirr LCN is beyond end of volume. "
"Weird.");
@@ -585,5 +585,5 @@
* this, but I am too lazy to create a function especially for it...
*/
- vol->mft_zone_end = vol->nr_clusters;
+ vol->mft_zone_end = vol->_VCL(nr_clusters);
switch (vol->mft_zone_multiplier) { /* % of volume size in clusters */
case 4:
@@ -806,11 +806,11 @@
if (!next_vcn) {
/* Get the last vcn in the $BITMAP attribute. */
- last_vcn = sle64_to_cpu(attr->allocated_size) >>
+ last_vcn = sle64_to_cpu(attr->_ANR(allocated_size)) >>
vol->cluster_size_bits;
vol->mftbmp_initialized_size =
- sle64_to_cpu(attr->initialized_size);
+ sle64_to_cpu(attr->_ANR(initialized_size));
/* Consistency check. */
if (vol->mftbmp_initialized_size <
- (vol->nr_mft_records + 7) >> 3) {
+ (vol->_VMM(nr_mft_records) + 7) >> 3) {
ntfs_error(sb, "$MFT/$BITMAP is too short to "
"contain a complete mft "
@@ -822,5 +822,5 @@
/* Get the lowest vcn for the next extent. */
- highest_vcn = sle64_to_cpu(attr->highest_vcn);
+ highest_vcn = sle64_to_cpu(attr->_ANR(highest_vcn));
next_vcn = highest_vcn + 1;
@@ -830,5 +830,5 @@
/* Avoid endless loops due to corruption. */
- if (next_vcn < sle64_to_cpu(attr->lowest_vcn)) {
+ if (next_vcn < sle64_to_cpu(attr->_ANR(lowest_vcn))) {
ntfs_error(sb, "$MFT/$BITMAP has corrupt attribute "
"list attribute. Run chkdsk.");
@@ -900,5 +900,5 @@
goto bitmap_failed;
}
- if ((vol->nr_lcn_bits + 7) >> 3 > vol->lcnbmp_ino->i_size) {
+ if ((vol->_VCL(nr_lcn_bits) + 7) >> 3 > vol->lcnbmp_ino->i_size) {
iput(vol->lcnbmp_ino);
bitmap_failed:
@@ -937,8 +937,8 @@
}
vi = (VOLUME_INFORMATION*)((char*)ctx->attr +
- le16_to_cpu(ctx->attr->value_offset));
+ le16_to_cpu(ctx->attr->_ARA(value_offset)));
/* Some bounds checks. */
if ((u8*)vi < (u8*)ctx->attr || (u8*)vi +
- le32_to_cpu(ctx->attr->value_length) > (u8*)ctx->attr +
+ le32_to_cpu(ctx->attr->_ARA(value_length)) > (u8*)ctx->attr +
le32_to_cpu(ctx->attr->length))
goto err_put_vol;
@@ -1132,5 +1132,5 @@
* multiples of PAGE_CACHE_SIZE.
*/
- max_index = (vol->nr_clusters + 7) >> (3 + PAGE_CACHE_SHIFT);
+ max_index = (vol->_VCL(nr_clusters) + 7) >> (3 + PAGE_CACHE_SHIFT);
/* Use multiples of 4 bytes. */
max_size = PAGE_CACHE_SIZE >> 2;
@@ -1171,5 +1171,5 @@
* page.
*/
- max_size = ((((vol->nr_clusters + 7) >> 3) & ~PAGE_CACHE_MASK)
+ max_size = ((((vol->_VCL(nr_clusters) + 7) >> 3) & ~PAGE_CACHE_MASK)
+ 3) >> 2;
/* If there is a partial page go back and do it. */
@@ -1215,5 +1215,5 @@
* multiples of PAGE_CACHE_SIZE.
*/
- max_index = (vol->nr_mft_records + 7) >> (3 + PAGE_CACHE_SHIFT);
+ max_index = (vol->_VMM(nr_mft_records) + 7) >> (3 + PAGE_CACHE_SHIFT);
/* Use multiples of 4 bytes. */
max_size = PAGE_CACHE_SIZE >> 2;
@@ -1254,10 +1254,10 @@
* page.
*/
- max_size = ((((vol->nr_mft_records + 7) >> 3) &
+ max_size = ((((vol->_VMM(nr_mft_records) + 7) >> 3) &
~PAGE_CACHE_MASK) + 3) >> 2;
/* If there is a partial page go back and do it. */
if (max_size) {
/* Compensate for out of bounds zero bits. */
- if ((i = vol->nr_mft_records & 31))
+ if ((i = vol->_VMM(nr_mft_records) & 31))
nr_free -= (s64)(32 - i);
ntfs_debug("Handling partial page, max_size = 0x%x",
@@ -1306,5 +1306,5 @@
* the total clusters.
*/
- sfs->f_blocks = vol->nr_clusters << vol->cluster_size_bits >>
+ sfs->f_blocks = vol->_VCL(nr_clusters) << vol->cluster_size_bits >>
PAGE_CACHE_SHIFT;
/* Free data blocks in file system in units of f_bsize. */
@@ -1746,4 +1746,5 @@
};
#endif /* VERSION >= 2.5.4 */
+
static int __init init_ntfs_fs(void)
{
Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/volume.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- volume.h 14 Feb 2002 06:12:27 -0000 1.6
+++ volume.h 25 Feb 2002 04:00:58 -0000 1.7
@@ -4,4 +4,5 @@
*
* Copyright (c) 2001,2002 Anton Altaparmakov.
+ * Copyright (C) 2002 Richard Russon.
*
* This program/include file is free software; you can redistribute it and/or
@@ -66,5 +67,5 @@
LCN nr_clusters; /* Volume size in clusters. */
LCN nr_lcn_bits; /* Number of bits in lcn bitmap. */
- };
+ } SN(vcl);
LCN mft_lcn; /* Cluster location of mft data. */
LCN mftmirr_lcn; /* Cluster location of copy of mft. */
@@ -81,5 +82,5 @@
s64 nr_mft_records; /* Number of records in the mft. */
s64 nr_mft_bits; /* Number of bits in mft bitmap. */
- };
+ } SN(vmm);
struct address_space mftbmp_mapping; /* Page cache for $MFT/$BITMAP. */
run_list *mftbmp_rl; /* Run list for $MFT/$BITMAP. */
@@ -99,4 +100,7 @@
struct nls_table *nls_map;
} ntfs_volume;
+
+#define _VCL(X) SC(vcl,X)
+#define _VMM(X) SC(vmm,X)
#endif /* _LINUX_NTFS_VOLUME_H */
|
