reiserfs: cleanup, rename key and item accessors to more friendly names

[deliverable/linux.git] / fs / reiserfs / dir.c

diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index af677353a3f5b5d06960b47c7d1c313e02cfb5be..1fe5cdeb586290a423f8e1a94ca6a5f538a7d7ea 100644 (file)
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -110,17 +110,17 @@ int reiserfs_readdir_inode(struct inode *inode, struct dir_context *ctx)
                       item_num, B_NR_ITEMS(bh));
 
                /* and entry must be not more than number of entries in the item */
-               RFALSE(I_ENTRY_COUNT(ih) < entry_num,
+               RFALSE(ih_entry_count(ih) < entry_num,
                       "vs-9010: entry number is too big %d (%d)",
-                      entry_num, I_ENTRY_COUNT(ih));
+                      entry_num, ih_entry_count(ih));
 
                if (search_res == POSITION_FOUND
-                   || entry_num < I_ENTRY_COUNT(ih)) {
+                   || entry_num < ih_entry_count(ih)) {
                        /* go through all entries in the directory item beginning from the entry, that has been found */
                        struct reiserfs_de_head *deh =
                            B_I_DEH(bh, ih) + entry_num;
 
-                       for (; entry_num < I_ENTRY_COUNT(ih);
+                       for (; entry_num < ih_entry_count(ih);
                             entry_num++, deh++) {
                                int d_reclen;
                                char *d_name;