From 7bc998980307c358afe3dc402bdd68d46f4661a4 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 20 Jul 2010 13:24:34 -0700 Subject: [PATCH] --- yaml --- r: 201070 b: refs/heads/master c: 844b9a8707f1fcf0482e0c52f44a555e799ccda6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fdtable.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2dca9421066..8c1cbd1e6321 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d51a6b2487724e8713cd2794cf09ffeee5f6932 +refs/heads/master: 844b9a8707f1fcf0482e0c52f44a555e799ccda6 diff --git a/trunk/include/linux/fdtable.h b/trunk/include/linux/fdtable.h index 013dc529e95f..d147461bc271 100644 --- a/trunk/include/linux/fdtable.h +++ b/trunk/include/linux/fdtable.h @@ -61,7 +61,8 @@ struct files_struct { (rcu_dereference_check((fdtfd), \ rcu_read_lock_held() || \ lockdep_is_held(&(files)->file_lock) || \ - atomic_read(&(files)->count) == 1)) + atomic_read(&(files)->count) == 1 || \ + rcu_my_thread_group_empty())) #define files_fdtable(files) \ (rcu_dereference_check_fdtable((files), (files)->fdt))