linux.git/fs/ufs, branch v6.13

ufs: ufs_sb_private_info: remove unused s_{2,3}apb fields

2024-11-13T00:02:12+00:00

These two fields are populated and stored as a "frequently used value"
in ufs_fill_super, but are not used afterwards in the driver.

Moreover, one of the shifts triggers UBSAN: shift-out-of-bounds when
apbshift is 12 because 12 * 3 = 36 and 1 << 36 does not fit in the 32
bit integer used to store the value.

Closes: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2087853
Signed-off-by: Agathe Porte 
Signed-off-by: Al Viro

ufs: Convert ufs_change_blocknr() to take a folio

2024-10-18T21:35:31+00:00

Now that ufs_new_fragments() has a folio, pass it to ufs_change_blocknr()
as a folio instead of converting it from folio to page to folio.
This removes the last use of struct page in UFS.

Signed-off-by: Matthew Wilcox (Oracle) 
Signed-off-by: Al Viro

ufs: Pass a folio to ufs_new_fragments()

2024-10-18T21:35:31+00:00

All callers now have a folio, pass it to ufs_new_fragments() instead
of converting back to a page.

Signed-off-by: Matthew Wilcox (Oracle) 
Signed-off-by: Al Viro

ufs: Convert ufs_inode_getfrag() to take a folio

2024-10-18T21:35:31+00:00

Pass bh->b_folio instead of bh->b_page.  They're in a union, so no
code change expected.

Signed-off-by: Matthew Wilcox (Oracle) 
Signed-off-by: Al Viro

ufs: Convert ufs_extend_tail() to take a folio

2024-10-18T21:35:31+00:00

Pass bh->b_folio instead of bh->b_page.  They're in a union, so no
code change expected.

Signed-off-by: Matthew Wilcox (Oracle) 
Signed-off-by: Al Viro

ufs: Convert ufs_inode_getblock() to take a folio

2024-10-18T21:35:31+00:00

Pass bh->b_folio instead of bh->b_page.  They're in a union, so no
code change expected.

Signed-off-by: Matthew Wilcox (Oracle) 
Signed-off-by: Al Viro

ufs: take the handling of free block counters into a helper

2024-10-18T21:35:31+00:00

There are 3 places where those counters (many and varied...) are
adjusted - when we are freeing fragments and get an entire block
freed, when we are freeing blocks and (in opposite direction) when
we are grabbing a block.  The logics is identical (modulo the
sign of adjustment) in all three; better take it into a helper -
less duplication and less clutter in the callers that way.

Signed-off-by: Al Viro

clean ufs_trunc_direct() up a bit...

2024-10-18T21:35:31+00:00

For short files (== no indirect blocks needed) UFS allows the last
block to be a partial one.  That creates some complications for
truncation down to "short file" lengths.  ufs_trunc_direct() is
called when we'd already made sure that new EOF is not in a hole;
nothing needs to be done if we are extending the file and in
case we are shrinking the file it needs to
	* shrink or free the old final block.
	* free all full direct blocks between the new and old EOF.
	* possibly shrink the new final block.

The logics is needlessly complicated by trying to keep all cases
handled by the same sequence of operations.
	if not shrinking
		nothing to do
	else if number of full blocks unchanged
		free the tail of possibly partial last block
	else
		free the tail of (currently full) new last block
		free all present (full) blocks in between
		free the (possibly partial) old last block

is easier to follow than the result of trying to unify these
cases.

Signed-off-by: Al Viro

ufs: get rid of ubh_{ubhcpymem,memcpyubh}()

2024-10-18T21:35:31+00:00

used only in ufs_read_cylinder_structures()/ufs_put_super_internal()
and there we can just as well avoid bothering with ufs_buffer_head
and just deal with it fragment-by-fragment.

Signed-off-by: Al Viro

ufs_inode_getfrag(): remove junk comment

2024-10-18T21:35:31+00:00

It used to be a stubbed out beginning of ufs2 support, which had
been implemented differently quite a while ago.  Remove the
commented-out (pseudo-)code.

Signed-off-by: Al Viro