mm/huge_memory.c: use head to emphasize the purpose of page

[linux-2.6-microblaze.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 8d47c76..a16da27 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -477,8 +477,7 @@ static int btrfs_find_new_delalloc_bytes(struct btrfs_inode *inode,
                u64 em_len;
                int ret = 0;
 
-               em = btrfs_get_extent(inode, NULL, 0, search_start,
-                                     search_len, 0);
+               em = btrfs_get_extent(inode, NULL, 0, search_start, search_len);
                if (IS_ERR(em))
                        return PTR_ERR(em);
 
@@ -1501,7 +1500,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
                ordered = btrfs_lookup_ordered_range(inode, start_pos,
                                                     last_pos - start_pos + 1);
                if (ordered &&
-                   ordered->file_offset + ordered->len > start_pos &&
+                   ordered->file_offset + ordered->num_bytes > start_pos &&
                    ordered->file_offset <= last_pos) {
                        unlock_extent_cached(&inode->io_tree, start_pos,
                                        last_pos, cached_state);
@@ -2390,7 +2389,7 @@ static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len)
 
        em = btrfs_get_extent(BTRFS_I(inode), NULL, 0,
                              round_down(*start, fs_info->sectorsize),
-                             round_up(*len, fs_info->sectorsize), 0);
+                             round_up(*len, fs_info->sectorsize));
        if (IS_ERR(em))
                return PTR_ERR(em);
 
@@ -2426,7 +2425,7 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,
                 * we need to try again.
                 */
                if ((!ordered ||
-                   (ordered->file_offset + ordered->len <= lockstart ||
+                   (ordered->file_offset + ordered->num_bytes <= lockstart ||
                     ordered->file_offset > lockend)) &&
                     !filemap_range_has_page(inode->i_mapping,
                                             lockstart, lockend)) {
@@ -2957,7 +2956,7 @@ static int btrfs_zero_range_check_range_boundary(struct inode *inode,
        int ret;
 
        offset = round_down(offset, sectorsize);
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize);
        if (IS_ERR(em))
                return PTR_ERR(em);
 
@@ -2990,8 +2989,8 @@ static int btrfs_zero_range(struct inode *inode,
 
        inode_dio_wait(inode);
 
-       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0,
-                             alloc_start, alloc_end - alloc_start, 0);
+       em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,
+                             alloc_end - alloc_start);
        if (IS_ERR(em)) {
                ret = PTR_ERR(em);
                goto out;
@@ -3034,8 +3033,8 @@ static int btrfs_zero_range(struct inode *inode,
 
        if (BTRFS_BYTES_TO_BLKS(fs_info, offset) ==
            BTRFS_BYTES_TO_BLKS(fs_info, offset + len - 1)) {
-               em = btrfs_get_extent(BTRFS_I(inode), NULL, 0,
-                                     alloc_start, sectorsize, 0);
+               em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, alloc_start,
+                                     sectorsize);
                if (IS_ERR(em)) {
                        ret = PTR_ERR(em);
                        goto out;
@@ -3248,7 +3247,7 @@ static long btrfs_fallocate(struct file *file, int mode,
                ordered = btrfs_lookup_first_ordered_extent(inode, locked_end);
 
                if (ordered &&
-                   ordered->file_offset + ordered->len > alloc_start &&
+                   ordered->file_offset + ordered->num_bytes > alloc_start &&
                    ordered->file_offset < alloc_end) {
                        btrfs_put_ordered_extent(ordered);
                        unlock_extent_cached(&BTRFS_I(inode)->io_tree,
@@ -3273,7 +3272,7 @@ static long btrfs_fallocate(struct file *file, int mode,
        INIT_LIST_HEAD(&reserve_list);
        while (cur_offset < alloc_end) {
                em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, cur_offset,
-                                     alloc_end - cur_offset, 0);
+                                     alloc_end - cur_offset);
                if (IS_ERR(em)) {
                        ret = PTR_ERR(em);
                        break;