Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

afs: Fix interruption of operations

The afs filesystem driver allows unstarted operations to be cancelled by
signal, but most of these can easily be restarted (mkdir for example). The
primary culprits for reproducing this are those applications that use
SIGALRM to display a progress counter.

File lock-extension operation is marked uninterruptible as we have a
limited time in which to do it, and the release op is marked
uninterruptible also as if we fail to unlock a file, we'll have to wait 20
mins before anyone can lock it again.

The store operation logs a warning if it gets interruption, e.g.:

kAFS: Unexpected error from FS.StoreData -4

because it's run from the background - but it can also be run from
fdatasync()-type things. However, store options aren't marked
interruptible at the moment.

Fix this in the following ways:

(1) Mark store operations as uninterruptible. It might make sense to
relax this for certain situations, but I'm not sure how to make sure
that background store ops aren't affected by signals to foreground
processes that happen to trigger them.

(2) In afs_get_io_locks(), where we're getting the serialisation lock for
talking to the fileserver, return ERESTARTSYS rather than EINTR
because a lot of the operations (e.g. mkdir) are restartable if we
haven't yet started sending the op to the server.

Fixes: e49c7b2f6de7 ("afs: Build an abstraction around an "operation" concept")
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Howells and committed by
Linus Torvalds
811f04ba e9919e11

+3 -2
+2 -2
fs/afs/fs_operation.c
··· 71 71 swap(vnode, vnode2); 72 72 73 73 if (mutex_lock_interruptible(&vnode->io_lock) < 0) { 74 - op->error = -EINTR; 74 + op->error = -ERESTARTSYS; 75 75 op->flags |= AFS_OPERATION_STOP; 76 76 _leave(" = f [I 0]"); 77 77 return false; ··· 80 80 81 81 if (vnode2) { 82 82 if (mutex_lock_interruptible_nested(&vnode2->io_lock, 1) < 0) { 83 - op->error = -EINTR; 83 + op->error = -ERESTARTSYS; 84 84 op->flags |= AFS_OPERATION_STOP; 85 85 mutex_unlock(&vnode->io_lock); 86 86 op->flags &= ~AFS_OPERATION_LOCK_0;
+1
fs/afs/write.c
··· 449 449 op->store.first_offset = offset; 450 450 op->store.last_to = to; 451 451 op->mtime = vnode->vfs_inode.i_mtime; 452 + op->flags |= AFS_OPERATION_UNINTR; 452 453 op->ops = &afs_store_data_operation; 453 454 454 455 try_next_key: