Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / fs / reiserfs / item_ops.c

diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
index cfaee912ee0935a66202dafc713dfc0d04e49365..e3c558d1b78c02c711ae9868fe409d349127103f 100644 (file)
--- a/fs/reiserfs/item_ops.c
+++ b/fs/reiserfs/item_ops.c
@@ -54,7 +54,7 @@ static void sd_print_item(struct item_head *ih, char *item)
        } else {
                struct stat_data *sd = (struct stat_data *)item;
 
-               printk("\t0%-6o | %6Lu | %2u | %d | %s\n", sd_v2_mode(sd),
+               printk("\t0%-6o | %6llu | %2u | %d | %s\n", sd_v2_mode(sd),
                       (unsigned long long)sd_v2_size(sd), sd_v2_nlink(sd),
                       sd_v2_rdev(sd), print_time(sd_v2_mtime(sd)));
        }
@@ -408,7 +408,7 @@ static void direntry_print_item(struct item_head *ih, char *item)
                        namebuf[namelen + 2] = 0;
                }
 
-               printk("%d:  %-15s%-15d%-15d%-15Ld%-15Ld(%s)\n",
+               printk("%d:  %-15s%-15d%-15d%-15lld%-15lld(%s)\n",
                       i, namebuf,
                       deh_dir_id(deh), deh_objectid(deh),
                       GET_HASH_VALUE(deh_offset(deh)),
@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
 }
 
 static struct item_operations errcatch_ops = {
-       errcatch_bytes_number,
-       errcatch_decrement_key,
-       errcatch_is_left_mergeable,
-       errcatch_print_item,
-       errcatch_check_item,
-
-       errcatch_create_vi,
-       errcatch_check_left,
-       errcatch_check_right,
-       errcatch_part_size,
-       errcatch_unit_num,
-       errcatch_print_vi
+       .bytes_number = errcatch_bytes_number,
+       .decrement_key = errcatch_decrement_key,
+       .is_left_mergeable = errcatch_is_left_mergeable,
+       .print_item = errcatch_print_item,
+       .check_item = errcatch_check_item,
+
+       .create_vi = errcatch_create_vi,
+       .check_left = errcatch_check_left,
+       .check_right = errcatch_check_right,
+       .part_size = errcatch_part_size,
+       .unit_num = errcatch_unit_num,
+       .print_vi = errcatch_print_vi
 };
 
 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)