[PATCH] files: break up files struct

In order for the RCU to work, the file table array, sets and their sizes must
be updated atomically.  Instead of ensuring this through too many memory
barriers, we put the arrays and their sizes in a separate structure.  This
patch takes the first step of putting the file table elements in a separate
structure fdtable that is embedded withing files_struct.  It also changes all
the users to refer to the file table using files_fdtable() macro.  Subsequent
applciation of RCU becomes easier after this.

Signed-off-by: Dipankar Sarma <dipankar@in.ibm.com>
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index cac0a1cf0050..374766455f5e 100644
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -293,11 +293,13 @@ static struct module_info {
 static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
 {
         struct inode *ino;
+        struct fdtable *fdt;
         /* I wonder which of these tests are superfluous... --patrik */
         spin_lock(&current->files->file_lock);
-        if (! current->files->fd[fd] ||
-            ! current->files->fd[fd]->f_dentry ||
-            ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
+        fdt = files_fdtable(current->files);
+        if (! fdt->fd[fd] ||
+            ! fdt->fd[fd]->f_dentry ||
+            ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||
             ! S_ISSOCK(ino->i_mode)) {
                 spin_unlock(&current->files->file_lock);
                 return TBADF;