open-scale-2.6.2-A0

From: Ingo Molnar
Date: Wed Feb 11 2004 - 06:59:07 EST



i've attached an obvious scalability improvement for write()s. We in
essence used a system-global lock for every open(WRITE) - argh!

Compiles & boots fine on x86 SMP.

Ingo
--- linux/fs/namei.c.orig2
+++ linux/fs/namei.c
@@ -238,30 +238,34 @@ int permission(struct inode * inode,int
* except for the cases where we don't hold i_writecount yet. Then we need to
* use {get,deny}_write_access() - these functions check the sign and refuse
* to do the change if sign is wrong. Exclusion between them is provided by
- * spinlock (arbitration_lock) and I'll rip the second arsehole to the first
- * who will try to move it in struct inode - just leave it here.
+ * the inode->i_lock spinlock.
*/
-static spinlock_t arbitration_lock = SPIN_LOCK_UNLOCKED;
+
int get_write_access(struct inode * inode)
{
- spin_lock(&arbitration_lock);
+ spin_lock(&inode->i_lock);
if (atomic_read(&inode->i_writecount) < 0) {
- spin_unlock(&arbitration_lock);
+ spin_unlock(&inode->i_lock);
return -ETXTBSY;
}
atomic_inc(&inode->i_writecount);
- spin_unlock(&arbitration_lock);
+ spin_unlock(&inode->i_lock);
+
return 0;
}
+
int deny_write_access(struct file * file)
{
- spin_lock(&arbitration_lock);
- if (atomic_read(&file->f_dentry->d_inode->i_writecount) > 0) {
- spin_unlock(&arbitration_lock);
+ struct inode *inode = file->f_dentry->d_inode;
+
+ spin_lock(&inode->i_lock);
+ if (atomic_read(&inode->i_writecount) > 0) {
+ spin_unlock(&inode->i_lock);
return -ETXTBSY;
}
- atomic_dec(&file->f_dentry->d_inode->i_writecount);
- spin_unlock(&arbitration_lock);
+ atomic_dec(&inode->i_writecount);
+ spin_unlock(&inode->i_lock);
+
return 0;
}