diff options
Diffstat (limited to 'include/linux/reiserfs_fs.h')
-rw-r--r-- | include/linux/reiserfs_fs.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index d0e4dce33ad5..c3fc6caaad3f 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h | |||
@@ -1159,7 +1159,7 @@ znodes are the way! */ | |||
1159 | #define PATH_READA 0x1 /* do read ahead */ | 1159 | #define PATH_READA 0x1 /* do read ahead */ |
1160 | #define PATH_READA_BACK 0x2 /* read backwards */ | 1160 | #define PATH_READA_BACK 0x2 /* read backwards */ |
1161 | 1161 | ||
1162 | struct path { | 1162 | struct treepath { |
1163 | int path_length; /* Length of the array above. */ | 1163 | int path_length; /* Length of the array above. */ |
1164 | int reada; | 1164 | int reada; |
1165 | struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements. */ | 1165 | struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements. */ |
@@ -1169,7 +1169,7 @@ struct path { | |||
1169 | #define pos_in_item(path) ((path)->pos_in_item) | 1169 | #define pos_in_item(path) ((path)->pos_in_item) |
1170 | 1170 | ||
1171 | #define INITIALIZE_PATH(var) \ | 1171 | #define INITIALIZE_PATH(var) \ |
1172 | struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} | 1172 | struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,} |
1173 | 1173 | ||
1174 | /* Get path element by path and path position. */ | 1174 | /* Get path element by path and path position. */ |
1175 | #define PATH_OFFSET_PELEMENT(p_s_path,n_offset) ((p_s_path)->path_elements +(n_offset)) | 1175 | #define PATH_OFFSET_PELEMENT(p_s_path,n_offset) ((p_s_path)->path_elements +(n_offset)) |
@@ -1327,7 +1327,7 @@ struct tree_balance { | |||
1327 | int need_balance_dirty; | 1327 | int need_balance_dirty; |
1328 | struct super_block *tb_sb; | 1328 | struct super_block *tb_sb; |
1329 | struct reiserfs_transaction_handle *transaction_handle; | 1329 | struct reiserfs_transaction_handle *transaction_handle; |
1330 | struct path *tb_path; | 1330 | struct treepath *tb_path; |
1331 | struct buffer_head *L[MAX_HEIGHT]; /* array of left neighbors of nodes in the path */ | 1331 | struct buffer_head *L[MAX_HEIGHT]; /* array of left neighbors of nodes in the path */ |
1332 | struct buffer_head *R[MAX_HEIGHT]; /* array of right neighbors of nodes in the path */ | 1332 | struct buffer_head *R[MAX_HEIGHT]; /* array of right neighbors of nodes in the path */ |
1333 | struct buffer_head *FL[MAX_HEIGHT]; /* array of fathers of the left neighbors */ | 1333 | struct buffer_head *FL[MAX_HEIGHT]; /* array of fathers of the left neighbors */ |
@@ -1793,41 +1793,41 @@ static inline void copy_key(struct reiserfs_key *to, | |||
1793 | memcpy(to, from, KEY_SIZE); | 1793 | memcpy(to, from, KEY_SIZE); |
1794 | } | 1794 | } |
1795 | 1795 | ||
1796 | int comp_items(const struct item_head *stored_ih, const struct path *p_s_path); | 1796 | int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path); |
1797 | const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path, | 1797 | const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path, |
1798 | const struct super_block *p_s_sb); | 1798 | const struct super_block *p_s_sb); |
1799 | int search_by_key(struct super_block *, const struct cpu_key *, | 1799 | int search_by_key(struct super_block *, const struct cpu_key *, |
1800 | struct path *, int); | 1800 | struct treepath *, int); |
1801 | #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL) | 1801 | #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL) |
1802 | int search_for_position_by_key(struct super_block *p_s_sb, | 1802 | int search_for_position_by_key(struct super_block *p_s_sb, |
1803 | const struct cpu_key *p_s_cpu_key, | 1803 | const struct cpu_key *p_s_cpu_key, |
1804 | struct path *p_s_search_path); | 1804 | struct treepath *p_s_search_path); |
1805 | extern void decrement_bcount(struct buffer_head *p_s_bh); | 1805 | extern void decrement_bcount(struct buffer_head *p_s_bh); |
1806 | void decrement_counters_in_path(struct path *p_s_search_path); | 1806 | void decrement_counters_in_path(struct treepath *p_s_search_path); |
1807 | void pathrelse(struct path *p_s_search_path); | 1807 | void pathrelse(struct treepath *p_s_search_path); |
1808 | int reiserfs_check_path(struct path *p); | 1808 | int reiserfs_check_path(struct treepath *p); |
1809 | void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path); | 1809 | void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path); |
1810 | 1810 | ||
1811 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, | 1811 | int reiserfs_insert_item(struct reiserfs_transaction_handle *th, |
1812 | struct path *path, | 1812 | struct treepath *path, |
1813 | const struct cpu_key *key, | 1813 | const struct cpu_key *key, |
1814 | struct item_head *ih, | 1814 | struct item_head *ih, |
1815 | struct inode *inode, const char *body); | 1815 | struct inode *inode, const char *body); |
1816 | 1816 | ||
1817 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, | 1817 | int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, |
1818 | struct path *path, | 1818 | struct treepath *path, |
1819 | const struct cpu_key *key, | 1819 | const struct cpu_key *key, |
1820 | struct inode *inode, | 1820 | struct inode *inode, |
1821 | const char *body, int paste_size); | 1821 | const char *body, int paste_size); |
1822 | 1822 | ||
1823 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, | 1823 | int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th, |
1824 | struct path *path, | 1824 | struct treepath *path, |
1825 | struct cpu_key *key, | 1825 | struct cpu_key *key, |
1826 | struct inode *inode, | 1826 | struct inode *inode, |
1827 | struct page *page, loff_t new_file_size); | 1827 | struct page *page, loff_t new_file_size); |
1828 | 1828 | ||
1829 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, | 1829 | int reiserfs_delete_item(struct reiserfs_transaction_handle *th, |
1830 | struct path *path, | 1830 | struct treepath *path, |
1831 | const struct cpu_key *key, | 1831 | const struct cpu_key *key, |
1832 | struct inode *inode, struct buffer_head *p_s_un_bh); | 1832 | struct inode *inode, struct buffer_head *p_s_un_bh); |
1833 | 1833 | ||
@@ -1858,7 +1858,7 @@ void padd_item(char *item, int total_length, int length); | |||
1858 | #define GET_BLOCK_NO_DANGLE 16 /* don't leave any transactions running */ | 1858 | #define GET_BLOCK_NO_DANGLE 16 /* don't leave any transactions running */ |
1859 | 1859 | ||
1860 | int restart_transaction(struct reiserfs_transaction_handle *th, | 1860 | int restart_transaction(struct reiserfs_transaction_handle *th, |
1861 | struct inode *inode, struct path *path); | 1861 | struct inode *inode, struct treepath *path); |
1862 | void reiserfs_read_locked_inode(struct inode *inode, | 1862 | void reiserfs_read_locked_inode(struct inode *inode, |
1863 | struct reiserfs_iget_args *args); | 1863 | struct reiserfs_iget_args *args); |
1864 | int reiserfs_find_actor(struct inode *inode, void *p); | 1864 | int reiserfs_find_actor(struct inode *inode, void *p); |
@@ -1905,7 +1905,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr); | |||
1905 | /* namei.c */ | 1905 | /* namei.c */ |
1906 | void set_de_name_and_namelen(struct reiserfs_dir_entry *de); | 1906 | void set_de_name_and_namelen(struct reiserfs_dir_entry *de); |
1907 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, | 1907 | int search_by_entry_key(struct super_block *sb, const struct cpu_key *key, |
1908 | struct path *path, struct reiserfs_dir_entry *de); | 1908 | struct treepath *path, struct reiserfs_dir_entry *de); |
1909 | struct dentry *reiserfs_get_parent(struct dentry *); | 1909 | struct dentry *reiserfs_get_parent(struct dentry *); |
1910 | /* procfs.c */ | 1910 | /* procfs.c */ |
1911 | 1911 | ||
@@ -1956,9 +1956,9 @@ extern const struct file_operations reiserfs_dir_operations; | |||
1956 | 1956 | ||
1957 | /* tail_conversion.c */ | 1957 | /* tail_conversion.c */ |
1958 | int direct2indirect(struct reiserfs_transaction_handle *, struct inode *, | 1958 | int direct2indirect(struct reiserfs_transaction_handle *, struct inode *, |
1959 | struct path *, struct buffer_head *, loff_t); | 1959 | struct treepath *, struct buffer_head *, loff_t); |
1960 | int indirect2direct(struct reiserfs_transaction_handle *, struct inode *, | 1960 | int indirect2direct(struct reiserfs_transaction_handle *, struct inode *, |
1961 | struct page *, struct path *, const struct cpu_key *, | 1961 | struct page *, struct treepath *, const struct cpu_key *, |
1962 | loff_t, char *); | 1962 | loff_t, char *); |
1963 | void reiserfs_unmap_buffer(struct buffer_head *); | 1963 | void reiserfs_unmap_buffer(struct buffer_head *); |
1964 | 1964 | ||
@@ -2045,7 +2045,7 @@ struct __reiserfs_blocknr_hint { | |||
2045 | struct inode *inode; /* inode passed to allocator, if we allocate unf. nodes */ | 2045 | struct inode *inode; /* inode passed to allocator, if we allocate unf. nodes */ |
2046 | long block; /* file offset, in blocks */ | 2046 | long block; /* file offset, in blocks */ |
2047 | struct in_core_key key; | 2047 | struct in_core_key key; |
2048 | struct path *path; /* search path, used by allocator to deternine search_start by | 2048 | struct treepath *path; /* search path, used by allocator to deternine search_start by |
2049 | * various ways */ | 2049 | * various ways */ |
2050 | struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and | 2050 | struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and |
2051 | * bitmap blocks changes */ | 2051 | * bitmap blocks changes */ |
@@ -2101,7 +2101,7 @@ static inline int reiserfs_new_form_blocknrs(struct tree_balance *tb, | |||
2101 | static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle | 2101 | static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle |
2102 | *th, struct inode *inode, | 2102 | *th, struct inode *inode, |
2103 | b_blocknr_t * new_blocknrs, | 2103 | b_blocknr_t * new_blocknrs, |
2104 | struct path *path, long block) | 2104 | struct treepath *path, long block) |
2105 | { | 2105 | { |
2106 | reiserfs_blocknr_hint_t hint = { | 2106 | reiserfs_blocknr_hint_t hint = { |
2107 | .th = th, | 2107 | .th = th, |
@@ -2118,7 +2118,7 @@ static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle | |||
2118 | static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle | 2118 | static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle |
2119 | *th, struct inode *inode, | 2119 | *th, struct inode *inode, |
2120 | b_blocknr_t * new_blocknrs, | 2120 | b_blocknr_t * new_blocknrs, |
2121 | struct path *path, long block) | 2121 | struct treepath *path, long block) |
2122 | { | 2122 | { |
2123 | reiserfs_blocknr_hint_t hint = { | 2123 | reiserfs_blocknr_hint_t hint = { |
2124 | .th = th, | 2124 | .th = th, |