Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/befs/endian.h b/fs/befs/endian.h
index 6cb84d896d05..27223878ba9f 100644
--- a/fs/befs/endian.h
+++ b/fs/befs/endian.h
@@ -102,22 +102,22 @@ cpu_to_fsrun(const struct super_block *sb, befs_block_run n)
 }
 
 static inline befs_data_stream
-fsds_to_cpu(const struct super_block *sb, befs_disk_data_stream n)
+fsds_to_cpu(const struct super_block *sb, const befs_disk_data_stream *n)
 {
         befs_data_stream data;
         int i;
 
         for (i = 0; i < BEFS_NUM_DIRECT_BLOCKS; ++i)
-                data.direct[i] = fsrun_to_cpu(sb, n.direct[i]);
+                data.direct[i] = fsrun_to_cpu(sb, n->direct[i]);
 
-        data.max_direct_range = fs64_to_cpu(sb, n.max_direct_range);
-        data.indirect = fsrun_to_cpu(sb, n.indirect);
-        data.max_indirect_range = fs64_to_cpu(sb, n.max_indirect_range);
-        data.double_indirect = fsrun_to_cpu(sb, n.double_indirect);
+        data.max_direct_range = fs64_to_cpu(sb, n->max_direct_range);
+        data.indirect = fsrun_to_cpu(sb, n->indirect);
+        data.max_indirect_range = fs64_to_cpu(sb, n->max_indirect_range);
+        data.double_indirect = fsrun_to_cpu(sb, n->double_indirect);
         data.max_double_indirect_range = fs64_to_cpu(sb,
-                                                     n.
+                                                     n->
                                                      max_double_indirect_range);
-        data.size = fs64_to_cpu(sb, n.size);
+        data.size = fs64_to_cpu(sb, n->size);
 
         return data;
 }