aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis de Bethencourt <luisbg@osg.samsung.com>2016-08-09 17:51:44 -0400
committerLuis de Bethencourt <luisbg@osg.samsung.com>2016-10-08 05:01:34 -0400
commit103c0fb3400b3efc74c806db2fd18e9eedc510d5 (patch)
treed67f0f97352bd5acce2d1919f3edbf0016e044ab
parent11674239f927c900bc50f8f2f5a4ec3e4a3df89b (diff)
befs: fix style issues in super.c
Fixing the following checkpatch.pl error: ERROR: "foo * bar" should be "foo *bar" +befs_load_sb(struct super_block *sb, befs_super_block * disk_sb) And the following warnings: WARNING: suspect code indent for conditional statements (8, 12) + if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE) + befs_sb->byte_order = BEFS_BYTESEX_LE; WARNING: suspect code indent for conditional statements (8, 12) + else if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_BE) + befs_sb->byte_order = BEFS_BYTESEX_BE; WARNING: break quoted strings at a space character + befs_error(sb, "blocksize(%u) cannot be larger" + "than system pagesize(%lu)", befs_sb->block_size, WARNING: line over 80 characters + if (befs_sb->log_start != befs_sb->log_end || befs_sb->flags == BEFS_DIRTY) { Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com> Signed-off-by: Salah Triki <salah.triki@gmail.com>
-rw-r--r--fs/befs/super.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/befs/super.c b/fs/befs/super.c
index 80b93c0a1a7b..7c50025c99d8 100644
--- a/fs/befs/super.c
+++ b/fs/befs/super.c
@@ -18,15 +18,15 @@
18 * of the befs superblock 18 * of the befs superblock
19 */ 19 */
20int 20int
21befs_load_sb(struct super_block *sb, befs_super_block * disk_sb) 21befs_load_sb(struct super_block *sb, befs_super_block *disk_sb)
22{ 22{
23 struct befs_sb_info *befs_sb = BEFS_SB(sb); 23 struct befs_sb_info *befs_sb = BEFS_SB(sb);
24 24
25 /* Check the byte order of the filesystem */ 25 /* Check the byte order of the filesystem */
26 if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE) 26 if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_LE)
27 befs_sb->byte_order = BEFS_BYTESEX_LE; 27 befs_sb->byte_order = BEFS_BYTESEX_LE;
28 else if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_BE) 28 else if (disk_sb->fs_byte_order == BEFS_BYTEORDER_NATIVE_BE)
29 befs_sb->byte_order = BEFS_BYTESEX_BE; 29 befs_sb->byte_order = BEFS_BYTESEX_BE;
30 30
31 befs_sb->magic1 = fs32_to_cpu(sb, disk_sb->magic1); 31 befs_sb->magic1 = fs32_to_cpu(sb, disk_sb->magic1);
32 befs_sb->magic2 = fs32_to_cpu(sb, disk_sb->magic2); 32 befs_sb->magic2 = fs32_to_cpu(sb, disk_sb->magic2);
@@ -82,7 +82,7 @@ befs_check_sb(struct super_block *sb)
82 } 82 }
83 83
84 if (befs_sb->block_size > PAGE_SIZE) { 84 if (befs_sb->block_size > PAGE_SIZE) {
85 befs_error(sb, "blocksize(%u) cannot be larger" 85 befs_error(sb, "blocksize(%u) cannot be larger "
86 "than system pagesize(%lu)", befs_sb->block_size, 86 "than system pagesize(%lu)", befs_sb->block_size,
87 PAGE_SIZE); 87 PAGE_SIZE);
88 return BEFS_ERR; 88 return BEFS_ERR;
@@ -106,10 +106,11 @@ befs_check_sb(struct super_block *sb)
106 if ((1 << befs_sb->ag_shift) != befs_sb->blocks_per_ag) 106 if ((1 << befs_sb->ag_shift) != befs_sb->blocks_per_ag)
107 befs_error(sb, "ag_shift disagrees with blocks_per_ag."); 107 befs_error(sb, "ag_shift disagrees with blocks_per_ag.");
108 108
109 if (befs_sb->log_start != befs_sb->log_end || befs_sb->flags == BEFS_DIRTY) { 109 if (befs_sb->log_start != befs_sb->log_end ||
110 befs_sb->flags == BEFS_DIRTY) {
110 befs_error(sb, "Filesystem not clean! There are blocks in the " 111 befs_error(sb, "Filesystem not clean! There are blocks in the "
111 "journal. You must boot into BeOS and mount this volume " 112 "journal. You must boot into BeOS and mount this "
112 "to make it clean."); 113 "volume to make it clean.");
113 return BEFS_ERR; 114 return BEFS_ERR;
114 } 115 }
115 116