summaryrefslogtreecommitdiff
path: root/fs/ufs
AgeCommit message (Collapse)AuthorFilesLines
2015-12-09don't put symlink bodies in pagecache into highmemAl Viro2-0/+2
kmap() in page_follow_link_light() needed to go - allowing to hold an arbitrary number of kmaps for long is a great way to deadlocking the system. new helper (inode_nohighmem(inode)) needs to be used for pagecache symlinks inodes; done for all in-tree cases. page_follow_link_light() instrumented to yell about anything missed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-12-07ufs: get rid of ->setattr() for symlinksAl Viro5-51/+5
It was to needed for a couple of months in 2010, until UFS quota support got dropped. Since then it's equivalent to simple_setattr() (i.e. the default) for everything except the regular files. And dropping it there allows to convert all UFS symlinks to {page,simple}_symlink_inode_operations, getting rid of fs/ufs/symlink.c completely. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-09-09fix ufs write vs readpage race when writing into a holeAl Viro1-2/+2
Followup to the UFS series - with the way we clear the new blocks (via buffer cache, possibly on more than a page worth of file) we really should not insert a reference to new block into inode block tree until after we'd cleared it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-07-07ufs_inode_get{frag,block}(): get rid of 'phys' argumentAl Viro1-15/+8
Just pass NULL as locked_page in case of first block in the indirect chain. Old calling conventions aside, a reason for having 'phys' was that ufs_inode_getfrag() used to be able to do _two_ allocations - indirect block and extending/reallocating a tail. We needed locked_page for the latter (it's a data), but we also needed to figure out that indirect block is metadata. So we used to pass non-NULL locked_page in all cases *and* used NULL phys as indication of being asked to allocate an indirect. With tail unpacking taken into a separate function we don't need those convolutions anymore. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_getfrag_block(): tidy up a bitAl Viro1-33/+15
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_getblock(): failure to read an indirect block is -EIOAl Viro1-2/+3
... and not "write to beginning of the disk", TYVM... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_getfrag_block(): turn following indirects into a loopAl Viro1-24/+8
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_getfrag(): pass index instead of 'fragment'Al Viro1-33/+17
same story as with ufs_inode_getblock() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_getfrag(): split extending the partial blocks offAl Viro1-63/+65
ufs_extend_tail() is handling that now. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_getblock(): pass indirect block number and full indexAl Viro1-46/+16
... instead of messing with buffer_head. We can bloody well do sb_bread() in there. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_getblock(): pass index instead of 'fragment'Al Viro1-19/+13
The value passed to ufs_inode_getblock() as the 3rd argument had lower bits ignored; the upper bits were shifted down and used and they actually make sense - those are _lower_ bits of index in indirect block (i.e. they form the index within a fragment within an indirect block). Pass those as argument. Upper bits of index (i.e. the number of fragment within indirect block) will join them shortly. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_get{frag,block}(): leave sb_getblk() to callerAl Viro1-33/+55
just return the damn block number Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_getfrag_block(): get rid of macro junglesAl Viro1-29/+22
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_get{frag,block}(): consolidate success exitsAl Viro1-28/+22
These calling conventions are rudiments of pre-2.3 times; they really need to be sanitized. This is the first step; next will be _always_ returning a block number, instead of this "return a pointer to buffer_head, except when we get to the actual data" crap. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: use the branch depth in ufs_getfrag_block()Al Viro1-6/+4
we'd already calculated it... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: move calculation of offsets into ufs_getfrag_block()Al Viro1-8/+9
... and massage ufs_frag_map() to take those instead of fragment number. As it is, we duplicate the damn thing on the write side, open-coded and bloody hard to follow. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_inode_get{frag,block}(): get rid of retriesAl Viro1-35/+8
We are holding ->truncate_mutex, so nobody else can alter our block pointers. Rechecks/retries were needed back when we only held BKL there, and had to cope with write_begin/writepage and writepage/truncate races. Can't happen anymore... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07__ufs_truncate_blocks(): avoid excessive dirtying of indirect blocksAl Viro1-3/+1
There's a case when an indirect block gets dirtied for no good reason - when there's a hole starting in the middle of area covered by it and spanning past its end, and truncate() is done precisely to the beginning of the hole. The block is obviously not modified at all - all removals happen beyond it. However, existing code ends up dirtying it just in case. It's trivial to fix and while it's not a real bug by any stretch of imagination, it makes the damn thing harder to follow. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07free_full_branch(): don't bother modifying the block we are going to freeAl Viro1-12/+2
Note that it's already made unreachable from the inode, so we don't have to worry about ufs_frag_map() walking into something already freed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07move marking inode dirty to the end of __ufs_truncate_blocks()Al Viro1-6/+1
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07free_full_branch(): saner calling conventionsAl Viro1-49/+51
Have caller fetch the block number *and* remove it from wherever it was. Pass the block number instead. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_branch(): kill recursionAl Viro1-26/+26
turn recursion into a pair of loops Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_branch(): massage towards killing recursionAl Viro1-5/+5
We always have 0 < depth2 <= depth in there, so if (--depth) { if (--depth2) A B } else { C // not using depth2 } D // not using depth2 is equivalent to if (--depth2) A with s/depth/depth - 1/ if (--depth) B else C D Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07split ufs_truncate_branch() into full- and partial-branch variantsAl Viro1-16/+58
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: unify the logics for collecting adjacent data blocks to freeAl Viro1-34/+22
open-coded in several places... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_branch(): separate the calls with non-NULL offsetsAl Viro1-4/+7
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_branch(): never call with offsets != NULL && depth2 == 0Al Viro1-3/+6
For calls in __ufs_truncate_blocks() it's just a matter of not incrementing offsets[0] and not making that call - immediately following loop will be executed one extra time and we'll be just fine. For recursive call in ufs_trunc_branch() itself, just assing NULL to offsets if we would be about to make such call. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07__ufs_trunc_blocks(): turn the part after switch into a loopAl Viro1-25/+10
... and turn the switch into if (), since all cases with depth != 1 have just become identical. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07__ufs_truncate_blocks(): unify freeing the full branchesAl Viro1-15/+14
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07unify ufs_trunc_..indirect()Al Viro1-138/+60
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_..indirect(): more massage towards unifyingAl Viro1-17/+26
Instead of manually checking that the array contains only zeroes, find the position of the last non-zero (in __ufs_truncate(), where we can conveniently do that) and use that to tell if there's any non-zero in the array tail passed to ufs_trunc_...indirect(). The goal of all that clumsiness is to get fold these functions together. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_...indirect(): pass the array of indices instead of offsetsAl Viro1-28/+22
rather than bitslicing the offset just formed as sum of shifted indices, pass the array of those indices itself. NULL is used as equivalent of "all zeroes" (== free the entire branch). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07__ufs_truncate(); find cutoff distances into branches by offsets[] arrayAl Viro1-2/+6
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_dindirect(): pass the number of blocks to keepAl Viro1-31/+26
same as the previous two. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_indirect(): pass the index of the first pointer to freeAl Viro1-33/+23
... instead of file offset. Same cleanups as in the tindirect conversion in previous commit. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs_trunc_tindirect(): pass the number of blocks to keepAl Viro1-17/+11
IOW, the distance of cutoff from the begining of the branch (in blocks). That (and the fact that block just prior to cutoff is guaranteed to be present) allows to tell whether to free triple indirect block just by looking at the offset. While we are at it, using u64 for index in the block is wrong - those should be unsigned int. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: beginning of __ufs_truncate_block() massageAl Viro1-4/+12
Use ufs_block_to_path() to find the cutoff path in the block pointers' tree. For now just use the information about the depth (to bypass the fully preserved subtrees); subsequent commits will use the information about actual path. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: the offsets ufs_block_to_path() puts into array are not sector_tAl Viro1-3/+3
type makes no sense - those are indices in block number arrays, not block numbers. And no, UFS is not likely to grow indirect blocks with 4Gpointers in them... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: move truncate code into inode.cAl Viro4-533/+470
It is closely tied to block pointers handling there, can benefit from existing helpers, etc. - no point keeping them apart. Trimmed the trailing whitespaces in inode.c at the same time. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: no retries are needed on truncateAl Viro1-40/+17
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: ufs_trunc_...() has exclusion with everything that might cause allocationsAl Viro1-12/+0
Currently - on lock_ufs(), eventually - on per-inode mutex. lock_ufs() used to be mere BKL, which is much weaker, so it needed those rechecks. BKL doesn't provide any exclusion once we lose CPU; its blind replacement, OTOH, _does_. Making that per-filesystem was an atrocity, but at least we can simplify life here. And yes, we certainly need to make that sucker per-inode - these days inode.c and truncate.c uses are needed only to protect the block pointers. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: ufs_trunc_direct() always returns 0Al Viro1-6/+3
make it return void Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: kill lock_ufs()Al Viro2-37/+2
There were 3 remaining users; in two of them we took ->s_lock immediately after lock_ufs() and held it until just before unlock_ufs(); the third one (statfs) could not be called from itself or from other two (remount and sync_fs). Just use ->s_lock in statfs and don't bother with lock_ufs at all. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: don't use lock_ufs() for block pointers tree protectionAl Viro5-47/+121
* stores to block pointers are under per-inode seqlock (meta_lock) and mutex (truncate_mutex) * fetches of block pointers are either under truncate_mutex, or wrapped into seqretry loop on meta_lock * all changes of ->i_size are under truncate_mutex and i_mutex * all changes of ->i_lastfrag are under truncate_mutex It's similar to what ext2 is doing; the main difference is that unlike ext2 we can't rely upon the atomicity of stores into block pointers - on UFS2 they are 64bit. So we can't cut the corner when switching a pointer from NULL to non-NULL as we could in ext2_splice_branch() and need to use meta_lock on all modifications. We use seqlock where ext2 uses rwlock; ext2 could probably also benefit from such change... Another non-trivial difference is that with UFS we *cannot* have reader grab truncate_mutex in case of race - it has to keep retrying. That might be possible to change, but not until we lift tail unpacking several levels up in call chain. After that commit we do *NOT* hold fs-wide serialization on accesses to block pointers anymore. Moreover, lock_ufs() can become a normal mutex now - it's only used on statfs, remount and sync_fs and none of those uses are recursive. As the matter of fact, *now* it can be collapsed with ->s_lock, and be eventually replaced with saner per-cylinder-group spinlocks, but that's a separate story. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: bforget() indirect blocks before freeing themAl Viro1-3/+3
right now it doesn't matter (lock_ufs() serializes everything), but when we switch to per-inode locking, it will be needed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: move lock_ufs() down into __ufs_truncate_blocks()Al Viro1-7/+2
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: move truncate_setsize() down into ufs_truncate()Al Viro1-16/+11
just prior to __ufs_truncate_blocks(), with matching change of calling conventions Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: free excessive blocks upon ->write_begin() failure/short copyAl Viro1-2/+16
Broken in "[PATCH] ufs: truncate should allocate block for last byte"; all way back in 2006. ufs_setattr() hadn't been the only user of vmtruncate() and eliminating ->truncate() method required corrections in a bunch of places. Eventually those places had migrated into ->write_begin() failure exit and ->write_end() after short copy... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: switch ufs_evict_inode() to trimmed-down variant of ufs_truncate()Al Viro3-27/+44
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2015-07-07ufs: kill more lock_ufs() callsAl Viro2-13/+4
a) move it inside ufs_truncate() b) ufs_free_inode() doesn't need it - it's serialized on ->s_lock c) ufs_write_inode() doesn't need it either (and can be called without it anyway). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.0) at 2024-11-19 17:27:31 +0300