diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-25 17:38:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-25 17:38:15 -0700 |
| commit | a452c4eb404df8a7f2a79a37ac77b90b6db1a2c9 (patch) | |
| tree | 0acdbe2d3c766a23ac24cba0d8d842260af4a514 /fs/udf | |
| parent | a8988507e577a89ccaf66b48ea645bcf6e861270 (diff) | |
| parent | 31e9dc49c2c03c3f166248f16dbe1248ffb5c6a9 (diff) | |
| download | linux-a452c4eb404df8a7f2a79a37ac77b90b6db1a2c9.tar.bz2 | |
Merge tag 'fs_for_v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs updates from Jan Kara:
"The biggest change in this pull is the addition of a deprecation
message about reiserfs with the outlook that we'd eventually be able
to remove it from the kernel. Because it is practically unmaintained
and untested and odd enough that people don't want to bother with it
anymore...
Otherwise there are small udf and ext2 fixes"
* tag 'fs_for_v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: remove redundant assignment of variable etype
reiserfs: Deprecate reiserfs
ext2: correct max file size computing
reiserfs: get rid of AOP_FLAG_CONT_EXPAND flag
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 48871615e489..4042d9739fb7 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -2474,7 +2474,6 @@ static unsigned int udf_count_free_table(struct super_block *sb, unsigned int accum = 0; uint32_t elen; struct kernel_lb_addr eloc; - int8_t etype; struct extent_position epos; mutex_lock(&UDF_SB(sb)->s_alloc_mutex); @@ -2482,7 +2481,7 @@ static unsigned int udf_count_free_table(struct super_block *sb, epos.offset = sizeof(struct unallocSpaceEntry); epos.bh = NULL; - while ((etype = udf_next_aext(table, &epos, &eloc, &elen, 1)) != -1) + while (udf_next_aext(table, &epos, &eloc, &elen, 1) != -1) accum += (elen >> table->i_sb->s_blocksize_bits); brelse(epos.bh); |