diff --git a/[refs] b/[refs] index f6692f53bb6a..f62f8b900cdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8c450b211c010ac55190da23ceb6b39b393f411 +refs/heads/master: 9433063bcb4b3c0c9e5ef3c24a811b63084dedb4 diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c index 77f1950b0aa0..c26ca54ed4de 100644 --- a/trunk/fs/btrfs/file.c +++ b/trunk/fs/btrfs/file.c @@ -174,7 +174,7 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans, hint_block = 0; if ((end_of_last_block & 4095) == 0) { - printk("strange end of last %Lu %lu %Lu\n", start_pos, write_bytes, end_of_last_block); + printk("strange end of last %Lu %zu %Lu\n", start_pos, write_bytes, end_of_last_block); } set_extent_uptodate(em_tree, start_pos, end_of_last_block, GFP_NOFS);