From: Pekka Enberg <[EMAIL PROTECTED]>
On 3/16/07, Andrew Morton <[EMAIL PROTECTED]> wrote:
> This all looks very strange. If the calling process expires its timeslice,
> the entire system call fails?
This changes revoke_mapping() to restart after cond_resched() to fix an
obvious goof made by me.
Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
---
fs/revoke.c | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
Index: uml-2.6/fs/revoke.c
===================================================================
--- uml-2.6.orig/fs/revoke.c 2007-03-16 09:02:16.000000000 +0200
+++ uml-2.6/fs/revoke.c 2007-03-16 09:11:46.000000000 +0200
@@ -194,34 +194,49 @@ return 0;
return -EINTR;
}
-static int revoke_mapping(struct address_space *mapping, struct file
*to_exclude)
+static void revoke_mapping_tree(struct address_space *mapping,
+ struct file *to_exclude,
+ struct zap_details *details)
{
struct vm_area_struct *vma;
struct prio_tree_iter iter;
- struct zap_details details;
- int err = 0;
-
- details.i_mmap_lock = &mapping->i_mmap_lock;
- spin_lock(&mapping->i_mmap_lock);
+ restart:
vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, 0, ULONG_MAX) {
if ((vma->vm_flags & VM_SHARED) && vma->vm_file != to_exclude) {
- err = revoke_vma(vma, &details);
- if (err)
- goto out;
+ if (revoke_vma(vma, details))
+ goto restart;
}
}
+}
+static void revoke_mapping_list(struct address_space *mapping,
+ struct file *to_exclude,
+ struct zap_details *details)
+{
+ struct vm_area_struct *vma;
+
+ restart:
list_for_each_entry(vma, &mapping->i_mmap_nonlinear,
shared.vm_set.list) {
if ((vma->vm_flags & VM_SHARED) && vma->vm_file != to_exclude) {
- err = revoke_vma(vma, &details);
- if (err)
- goto out;
+ if (revoke_vma(vma, details))
+ goto restart;
}
}
- out:
+}
+
+static void revoke_mapping(struct address_space *mapping, struct file
*to_exclude)
+{
+ struct zap_details details;
+
+ details.i_mmap_lock = &mapping->i_mmap_lock;
+
+ spin_lock(&mapping->i_mmap_lock);
+ if (unlikely(!prio_tree_empty(&mapping->i_mmap)))
+ revoke_mapping_tree(mapping, to_exclude, &details);
+ if (unlikely(!list_empty(&mapping->i_mmap_nonlinear)))
+ revoke_mapping_list(mapping, to_exclude, &details);
spin_unlock(&mapping->i_mmap_lock);
- return err;
}
static void restore_file(struct revokefs_inode_info *info)
@@ -441,11 +456,7 @@ int err = 0;
/*
* Take down shared memory mappings.
*/
- err = revoke_mapping(inode->i_mapping, to_exclude);
- if (err) {
- restore_files(table);
- goto out_free_table;
- }
+ revoke_mapping(inode->i_mapping, to_exclude);
/*
* Now, revoke the files for good.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
