Merge branch 'master' of /repos/git/linux-2.6

[mv-sheeva.git] / include / linux / fdtable.h

diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index a2ec74bc4812ff3242d22277870fc12ceae755a0..013dc529e95ffc43121fbf8cfbac9d432fa29bc6 100644 (file)
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -57,7 +57,14 @@ struct files_struct {
        struct file * fd_array[NR_OPEN_DEFAULT];
 };
 
-#define files_fdtable(files) (rcu_dereference((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))
+
+#define files_fdtable(files) \
+               (rcu_dereference_check_fdtable((files), (files)->fdt))
 
 struct file_operations;
 struct vfsmount;
@@ -78,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(fdt->fd[fd]);
+               file = rcu_dereference_check_fdtable(files, fdt->fd[fd]);
        return file;
 }