GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-27 08:43:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

afs: Make record checking use TASK_UNINTERRUPTIBLE when appropriate

Browse source 
When an operation is meant to be done uninterruptibly (such as
FS.StoreData), we should not be allowing volume and server record checking
to be interrupted.

Fixes: d2ddc776a4 ("afs: Overhaul volume and server record caching and fileserver rotation")
Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells 2020-04-16 18:17:13 +01:00
parent 69cf3978f3
commit c4bfda16d1
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/afs/internal.h
View file

@ -1333,7 +1333,7 @@ extern struct afs_volume *afs_create_volume(struct afs_fs_context *);
extern void afs_activate_volume(struct afs_volume *); extern void afs_activate_volume(struct afs_volume *);
extern void afs_deactivate_volume(struct afs_volume *); extern void afs_deactivate_volume(struct afs_volume *);
extern void afs_put_volume(struct afs_cell *, struct afs_volume *); extern void afs_put_volume(struct afs_cell *, struct afs_volume *);
extern int afs_check_volume_status(struct afs_volume *, struct key *); extern int afs_check_volume_status(struct afs_volume *, struct afs_fs_cursor *);
/* /*
* write.c * write.c

6
fs/afs/rotate.c
View file

@ -192,7 +192,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
write_unlock(&vnode->volume->servers_lock); write_unlock(&vnode->volume->servers_lock);
set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags); set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags);
error = afs_check_volume_status(vnode->volume, fc->key); error = afs_check_volume_status(vnode->volume, fc);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
@ -281,7 +281,7 @@ bool afs_select_fileserver(struct afs_fs_cursor *fc)
set_bit(AFS_VOLUME_WAIT, &vnode->volume->flags); set_bit(AFS_VOLUME_WAIT, &vnode->volume->flags);
set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags); set_bit(AFS_VOLUME_NEEDS_UPDATE, &vnode->volume->flags);
error = afs_check_volume_status(vnode->volume, fc->key); error = afs_check_volume_status(vnode->volume, fc);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;
@ -341,7 +341,7 @@ start:
/* See if we need to do an update of the volume record. Note that the /* See if we need to do an update of the volume record. Note that the
* volume may have moved or even have been deleted. * volume may have moved or even have been deleted.
*/ */
error = afs_check_volume_status(vnode->volume, fc->key); error = afs_check_volume_status(vnode->volume, fc);
if (error < 0) if (error < 0)
goto failed_set_error; goto failed_set_error;

7
fs/afs/server.c
View file

@ -594,12 +594,9 @@ retry:
} }
ret = wait_on_bit(&server->flags, AFS_SERVER_FL_UPDATING, ret = wait_on_bit(&server->flags, AFS_SERVER_FL_UPDATING,
TASK_INTERRUPTIBLE); (fc->flags & AFS_FS_CURSOR_INTR) ?
TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
if (ret == -ERESTARTSYS) { if (ret == -ERESTARTSYS) {
if (!(fc->flags & AFS_FS_CURSOR_INTR) && server->addresses) {
_leave(" = t [intr]");
return true;
}
fc->error = ret; fc->error = ret;
_leave(" = f [intr]"); _leave(" = f [intr]");
return false; return false;

8
fs/afs/volume.c
View file

@ -281,7 +281,7 @@ error:
/* /*
* Make sure the volume record is up to date. * Make sure the volume record is up to date.
*/ */
int afs_check_volume_status(struct afs_volume *volume, struct key *key) int afs_check_volume_status(struct afs_volume *volume, struct afs_fs_cursor *fc)
{ {
time64_t now = ktime_get_real_seconds(); time64_t now = ktime_get_real_seconds();
int ret, retries = 0; int ret, retries = 0;
@ -299,7 +299,7 @@ retry:
} }
if (!test_and_set_bit_lock(AFS_VOLUME_UPDATING, &volume->flags)) { if (!test_and_set_bit_lock(AFS_VOLUME_UPDATING, &volume->flags)) {
ret = afs_update_volume_status(volume, key); ret = afs_update_volume_status(volume, fc->key);
clear_bit_unlock(AFS_VOLUME_WAIT, &volume->flags); clear_bit_unlock(AFS_VOLUME_WAIT, &volume->flags);
clear_bit_unlock(AFS_VOLUME_UPDATING, &volume->flags); clear_bit_unlock(AFS_VOLUME_UPDATING, &volume->flags);
wake_up_bit(&volume->flags, AFS_VOLUME_WAIT); wake_up_bit(&volume->flags, AFS_VOLUME_WAIT);
@ -312,7 +312,9 @@ retry:
return 0; return 0;
} }
ret = wait_on_bit(&volume->flags, AFS_VOLUME_WAIT, TASK_INTERRUPTIBLE); ret = wait_on_bit(&volume->flags, AFS_VOLUME_WAIT,
(fc->flags & AFS_FS_CURSOR_INTR) ?
TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
if (ret == -ERESTARTSYS) { if (ret == -ERESTARTSYS) {
_leave(" = %d", ret); _leave(" = %d", ret);
return ret; return ret;