[tip:core/rcu] vfs: Abstract rcu_dereference_check for files-fdtable use
in [Kernel]
|
Prev: [tip:core/rcu] rcu: Integrate rcu_dereference_check() message into lockdep
Next: [tip:core/rcu] rcu: Use canonical URL for Mathieu's dissertation
From: tip-bot for Paul E. McKenney on 25 Feb 2010 05:20 Commit-ID: af61b96b4f68f7ab25ebf34fed275fabf64f2edc Gitweb: http://git.kernel.org/tip/af61b96b4f68f7ab25ebf34fed275fabf64f2edc Author: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> AuthorDate: Mon, 22 Feb 2010 17:04:53 -0800 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Thu, 25 Feb 2010 10:34:49 +0100 vfs: Abstract rcu_dereference_check for files-fdtable use Create an rcu_dereference_check_fdtable() that encapsulates the rcu_dereference_check() condition for fcheck_files() use. This has the beneficial side-effect of getting rid of a very long line. Suggested-by: Peter Zijlstra <peterz(a)infradead.org> Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: laijs(a)cn.fujitsu.com Cc: dipankar(a)in.ibm.com Cc: mathieu.desnoyers(a)polymtl.ca Cc: josh(a)joshtriplett.org Cc: dvhltc(a)us.ibm.com Cc: niv(a)us.ibm.com Cc: peterz(a)infradead.org Cc: rostedt(a)goodmis.org Cc: Valdis.Kletnieks(a)vt.edu Cc: dhowells(a)redhat.com LKML-Reference: <1266887105-1528-9-git-send-email-paulmck(a)linux.vnet.ibm.com> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- include/linux/fdtable.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index 144412f..013dc52 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -57,11 +57,14 @@ struct files_struct { struct file * fd_array[NR_OPEN_DEFAULT]; }; -#define files_fdtable(files) \ - (rcu_dereference_check((files)->fdt, \ +#define rcu_dereference_check_fdtable(files, fdtfd) \ + (rcu_dereference_check((fdtfd), \ rcu_read_lock_held() || \ lockdep_is_held(&(files)->file_lock) || \ - atomic_read(&files->count) == 1)) + atomic_read(&(files)->count) == 1)) + +#define files_fdtable(files) \ + (rcu_dereference_check_fdtable((files), (files)->fdt)) struct file_operations; struct vfsmount; @@ -82,7 +85,7 @@ static inline struct file * fcheck_files(struct files_struct *files, unsigned in struct fdtable *fdt = files_fdtable(files); if (fd < fdt->max_fds) - file = rcu_dereference_check(fdt->fd[fd], rcu_read_lock_held() || lockdep_is_held(&files->file_lock) || atomic_read(&files->count) == 1); + file = rcu_dereference_check_fdtable(files, fdt->fd[fd]); return file; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |