diff options
Diffstat (limited to 'fs/ubifs/journal.c')
-rw-r--r-- | fs/ubifs/journal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index f91b745908ea..9b7c54e0cd2a 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c | |||
@@ -191,7 +191,7 @@ again: | |||
191 | if (wbuf->lnum != -1 && avail >= len) { | 191 | if (wbuf->lnum != -1 && avail >= len) { |
192 | /* | 192 | /* |
193 | * Someone else has switched the journal head and we have | 193 | * Someone else has switched the journal head and we have |
194 | * enough space now. This happens when more then one process is | 194 | * enough space now. This happens when more than one process is |
195 | * trying to write to the same journal head at the same time. | 195 | * trying to write to the same journal head at the same time. |
196 | */ | 196 | */ |
197 | dbg_jnl("return LEB %d back, already have LEB %d:%d", | 197 | dbg_jnl("return LEB %d back, already have LEB %d:%d", |
@@ -704,7 +704,7 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, | |||
704 | data->size = cpu_to_le32(len); | 704 | data->size = cpu_to_le32(len); |
705 | zero_data_node_unused(data); | 705 | zero_data_node_unused(data); |
706 | 706 | ||
707 | if (!(ui->flags && UBIFS_COMPR_FL)) | 707 | if (!(ui->flags & UBIFS_COMPR_FL)) |
708 | /* Compression is disabled for this inode */ | 708 | /* Compression is disabled for this inode */ |
709 | compr_type = UBIFS_COMPR_NONE; | 709 | compr_type = UBIFS_COMPR_NONE; |
710 | else | 710 | else |
@@ -1220,7 +1220,7 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, | |||
1220 | data_key_init(c, &key, inum, blk); | 1220 | data_key_init(c, &key, inum, blk); |
1221 | 1221 | ||
1222 | bit = old_size & (UBIFS_BLOCK_SIZE - 1); | 1222 | bit = old_size & (UBIFS_BLOCK_SIZE - 1); |
1223 | blk = (old_size >> UBIFS_BLOCK_SHIFT) - (bit ? 0: 1); | 1223 | blk = (old_size >> UBIFS_BLOCK_SHIFT) - (bit ? 0 : 1); |
1224 | data_key_init(c, &to_key, inum, blk); | 1224 | data_key_init(c, &to_key, inum, blk); |
1225 | 1225 | ||
1226 | err = ubifs_tnc_remove_range(c, &key, &to_key); | 1226 | err = ubifs_tnc_remove_range(c, &key, &to_key); |