vserver 1.9.3

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

diff --git a/fs/ntfs/inode.h b/fs/ntfs/inode.h
index 465bef6..3aa7b87 100644 (file)
--- a/fs/ntfs/inode.h
+++ b/fs/ntfs/inode.h
@@ -53,21 +53,21 @@ struct _ntfs_inode {
         * name_len = 0 for files and name = I30 (global constant) and
         * name_len = 4 for directories.
         */
-       ATTR_TYPES type;        /* Attribute type of this fake inode. */
+       ATTR_TYPE type; /* Attribute type of this fake inode. */
        ntfschar *name;         /* Attribute name of this fake inode. */
        u32 name_len;           /* Attribute name length of this fake inode. */
-       run_list run_list;      /* If state has the NI_NonResident bit set,
-                                  the run list of the unnamed data attribute
+       runlist runlist;        /* If state has the NI_NonResident bit set,
+                                  the runlist of the unnamed data attribute
                                   (if a file) or of the index allocation
                                   attribute (directory) or of the attribute
                                   described by the fake inode (if NInoAttr()).
-                                  If run_list.rl is NULL, the run list has not
+                                  If runlist.rl is NULL, the runlist has not
                                   been read in yet or has been unmapped. If
                                   NI_NonResident is clear, the attribute is
                                   resident (file and fake inode) or there is
                                   no $I30 index allocation attribute
                                   (small directory). In the latter case
-                                  run_list.rl is always NULL.*/
+                                  runlist.rl is always NULL.*/
        /*
         * The following fields are only valid for real inodes and extent
         * inodes.
@@ -88,7 +88,7 @@ struct _ntfs_inode {
         */
        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. */
+       runlist attr_list_rl;   /* Run list for the attribute list value. */
        union {
                struct { /* It is a directory, $MFT, or an index inode. */
                        struct inode *bmp_ino;  /* Attribute inode for the
@@ -96,7 +96,7 @@ struct _ntfs_inode {
                        u32 block_size;         /* Size of an index block. */
                        u32 vcn_size;           /* Size of a vcn in this
                                                   index. */
-                       COLLATION_RULES collation_rule; /* The collation rule
+                       COLLATION_RULE collation_rule; /* The collation rule
                                                   for the index. */
                        u8 block_size_bits;     /* Log2 of the above. */
                        u8 vcn_size_bits;       /* Log2 of the above. */
@@ -252,7 +252,7 @@ typedef struct {
        unsigned long mft_no;
        ntfschar *name;
        u32 name_len;
-       ATTR_TYPES type;
+       ATTR_TYPE type;
 } ntfs_attr;
 
 typedef int (*test_t)(struct inode *, void *);
@@ -260,7 +260,7 @@ typedef int (*test_t)(struct inode *, void *);
 extern int ntfs_test_inode(struct inode *vi, ntfs_attr *na);
 
 extern struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no);
-extern struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPES type,
+extern struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPE type,
                ntfschar *name, u32 name_len);
 extern struct inode *ntfs_index_iget(struct inode *base_vi, ntfschar *name,
                u32 name_len);
@@ -285,7 +285,7 @@ extern void ntfs_truncate(struct inode *vi);
 
 extern int ntfs_setattr(struct dentry *dentry, struct iattr *attr);
 
-extern void ntfs_write_inode(struct inode *vi, int sync);
+extern int ntfs_write_inode(struct inode *vi, int sync);
 
 static inline void ntfs_commit_inode(struct inode *vi)
 {