aboutsummaryrefslogtreecommitdiff
path: root/fs/filesystems.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-04-22 10:19:26 +0200
committerIngo Molnar <mingo@elte.hu>2011-04-22 10:19:30 +0200
commiteff430de53be6f3328c3eebe93755f1ecf499e37 (patch)
treec8e5ae958fe3e6656b4e96c83bbda17e649321a2 /fs/filesystems.c
parent9cbdb702092a2d82f909312f4ec3eeded77bb82e (diff)
parent91e8549bde9e5cc88c5a2e8c8114389279e240b5 (diff)
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/filesystems.c')
-rw-r--r--fs/filesystems.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/filesystems.c b/fs/filesystems.c
index 751d6b255a1..0845f84f2a5 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -110,14 +110,13 @@ int unregister_filesystem(struct file_system_type * fs)
*tmp = fs->next;
fs->next = NULL;
write_unlock(&file_systems_lock);
+ synchronize_rcu();
return 0;
}
tmp = &(*tmp)->next;
}
write_unlock(&file_systems_lock);
- synchronize_rcu();
-
return -EINVAL;
}