[PATCH] files: lock-free fd look-up

[linux-2.6.git] / drivers / char / tty_io.c

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 0bfc7af689172655c948ee2c025a69331692e98a..e5953f3433f3ea425ecd966c752a35ec68b63901 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2480,7 +2480,7 @@ static void __do_SAK(void *arg)
                }
                task_lock(p);
                if (p->files) {
                }
                task_lock(p);
                if (p->files) {

-                       spin_lock(&p->files->file_lock);
+                       rcu_read_lock();

                        fdt = files_fdtable(p->files);
                        for (i=0; i < fdt->max_fds; i++) {
                                filp = fcheck_files(p->files, i);
                        fdt = files_fdtable(p->files);
                        for (i=0; i < fdt->max_fds; i++) {
                                filp = fcheck_files(p->files, i);


@@ -2495,7 +2495,7 @@ static void __do_SAK(void *arg)
                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       spin_unlock(&p->files->file_lock);
+                       rcu_read_unlock();

                }
                task_unlock(p);
        } while_each_task_pid(session, PIDTYPE_SID, p);
                }
                task_unlock(p);
        } while_each_task_pid(session, PIDTYPE_SID, p);