[PATCH 1/2] revoke: rename to can_revoke_{file|vma}
From: Pekka Enberg <[EMAIL PROTECTED]> The inode_matches and need_revoke functions have confusing names so rename them to can_revoke_file and can_revoke_vma respectively. Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]> --- fs/revoke.c | 33 - 1 file changed, 16 insertions(+), 17 deletions(-) Index: 26-mm/fs/revoke.c === --- 26-mm.orig/fs/revoke.c 2007-05-03 16:46:00.0 +0300 +++ 26-mm/fs/revoke.c 2007-05-03 17:09:52.0 +0300 @@ -75,10 +75,13 @@ filp->f_pos = 0; return NULL; } -static inline int inode_matches(struct file *file, struct inode *inode, - struct file *to_exclude) +static inline bool can_revoke_file(struct file *file, struct inode *inode, + struct file *to_exclude) { - return file && file != to_exclude && file->f_dentry->d_inode == inode; + if (!file || file == to_exclude) + return false; + + return file->f_dentry->d_inode == inode; } static inline bool revoke_table_is_full(struct revoke_table *table) @@ -116,7 +119,7 @@ for (fd = 0; fd < fdt->max_fds; fd++) { struct inode *new_inode; filp = fcheck_files(files, fd); - if (!inode_matches(filp, inode, to_exclude)) + if (!can_revoke_file(filp, inode, to_exclude)) continue; if (!filp->f_op->revoke) { @@ -159,22 +162,18 @@ for (fd = 0; fd < fdt->max_fds; fd++) { return err; } -static inline bool need_revoke(struct vm_area_struct *vma, - struct inode *inode, - struct file *to_exclude) +static inline bool can_revoke_vma(struct vm_area_struct *vma, + struct inode *inode, struct file *to_exclude) { struct file *file = vma->vm_file; if (vma->vm_flags & VM_REVOKED) return false; - if (!file) - return false; - - if (file->f_path.dentry->d_inode != inode) + if (!file || file == to_exclude) return false; - return file != to_exclude; + return file->f_path.dentry->d_inode == inode; } static int __revoke_break_cow(struct task_struct *tsk, struct inode *inode, @@ -191,7 +190,7 @@ int err = 0; if (vma->vm_flags & VM_SHARED) continue; - if (!need_revoke(vma, inode, to_exclude)) + if (!can_revoke_vma(vma, inode, to_exclude)) continue; ret = get_user_pages(tsk, tsk->mm, vma->vm_start, @@ -287,7 +286,7 @@ int err = 0; if (!(vma->vm_flags & VM_SHARED)) continue; - if (!need_revoke(vma, mapping->host, to_exclude)) + if (!can_revoke_vma(vma, mapping->host, to_exclude)) continue; err = revoke_vma(vma, ); @@ -320,7 +319,7 @@ vma_prio_tree_foreach(vma, , if (!(vma->vm_flags & VM_SHARED)) continue; - if (likely(!need_revoke(vma, mapping->host, to_exclude))) + if (likely(!can_revoke_vma(vma, mapping->host, to_exclude))) continue; err = revoke_mm(vma->vm_mm, mapping, to_exclude); @@ -348,7 +347,7 @@ int try_again = 0; list_for_each_entry(vma, >i_mmap_nonlinear, shared.vm_set.list) { int err; - if (likely(!need_revoke(vma, mapping->host, to_exclude))) + if (likely(!can_revoke_vma(vma, mapping->host, to_exclude))) continue; err = revoke_mm(vma->vm_mm, mapping, to_exclude); @@ -470,7 +469,7 @@ for (fd = 0; fd < fdt->max_fds; fd++) struct file *file; file = fcheck_files(files, fd); - if (inode_matches(file, inode, to_exclude)) { + if (can_revoke_file(file, inode, to_exclude)) { nr_fds += fdt->max_fds; break; } - 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/
[PATCH 1/2] revoke: rename to can_revoke_{file|vma}
From: Pekka Enberg [EMAIL PROTECTED] The inode_matches and need_revoke functions have confusing names so rename them to can_revoke_file and can_revoke_vma respectively. Signed-off-by: Pekka Enberg [EMAIL PROTECTED] --- fs/revoke.c | 33 - 1 file changed, 16 insertions(+), 17 deletions(-) Index: 26-mm/fs/revoke.c === --- 26-mm.orig/fs/revoke.c 2007-05-03 16:46:00.0 +0300 +++ 26-mm/fs/revoke.c 2007-05-03 17:09:52.0 +0300 @@ -75,10 +75,13 @@ filp-f_pos = 0; return NULL; } -static inline int inode_matches(struct file *file, struct inode *inode, - struct file *to_exclude) +static inline bool can_revoke_file(struct file *file, struct inode *inode, + struct file *to_exclude) { - return file file != to_exclude file-f_dentry-d_inode == inode; + if (!file || file == to_exclude) + return false; + + return file-f_dentry-d_inode == inode; } static inline bool revoke_table_is_full(struct revoke_table *table) @@ -116,7 +119,7 @@ for (fd = 0; fd fdt-max_fds; fd++) { struct inode *new_inode; filp = fcheck_files(files, fd); - if (!inode_matches(filp, inode, to_exclude)) + if (!can_revoke_file(filp, inode, to_exclude)) continue; if (!filp-f_op-revoke) { @@ -159,22 +162,18 @@ for (fd = 0; fd fdt-max_fds; fd++) { return err; } -static inline bool need_revoke(struct vm_area_struct *vma, - struct inode *inode, - struct file *to_exclude) +static inline bool can_revoke_vma(struct vm_area_struct *vma, + struct inode *inode, struct file *to_exclude) { struct file *file = vma-vm_file; if (vma-vm_flags VM_REVOKED) return false; - if (!file) - return false; - - if (file-f_path.dentry-d_inode != inode) + if (!file || file == to_exclude) return false; - return file != to_exclude; + return file-f_path.dentry-d_inode == inode; } static int __revoke_break_cow(struct task_struct *tsk, struct inode *inode, @@ -191,7 +190,7 @@ int err = 0; if (vma-vm_flags VM_SHARED) continue; - if (!need_revoke(vma, inode, to_exclude)) + if (!can_revoke_vma(vma, inode, to_exclude)) continue; ret = get_user_pages(tsk, tsk-mm, vma-vm_start, @@ -287,7 +286,7 @@ int err = 0; if (!(vma-vm_flags VM_SHARED)) continue; - if (!need_revoke(vma, mapping-host, to_exclude)) + if (!can_revoke_vma(vma, mapping-host, to_exclude)) continue; err = revoke_vma(vma, details); @@ -320,7 +319,7 @@ vma_prio_tree_foreach(vma, iter, mapp if (!(vma-vm_flags VM_SHARED)) continue; - if (likely(!need_revoke(vma, mapping-host, to_exclude))) + if (likely(!can_revoke_vma(vma, mapping-host, to_exclude))) continue; err = revoke_mm(vma-vm_mm, mapping, to_exclude); @@ -348,7 +347,7 @@ int try_again = 0; list_for_each_entry(vma, mapping-i_mmap_nonlinear, shared.vm_set.list) { int err; - if (likely(!need_revoke(vma, mapping-host, to_exclude))) + if (likely(!can_revoke_vma(vma, mapping-host, to_exclude))) continue; err = revoke_mm(vma-vm_mm, mapping, to_exclude); @@ -470,7 +469,7 @@ for (fd = 0; fd fdt-max_fds; fd++) struct file *file; file = fcheck_files(files, fd); - if (inode_matches(file, inode, to_exclude)) { + if (can_revoke_file(file, inode, to_exclude)) { nr_fds += fdt-max_fds; break; } - 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/