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);
|
