--- linux-2.5.24-clean/fs/driverfs/inode.c Thu Jun 20 15:53:45 2002 +++ linux/fs/driverfs/inode.c Thu Jul 4 00:22:54 2002 @@ -128,6 +128,7 @@ return inode; } +static spinlock_t driverfs_mknod_lock = SPIN_LOCK_UNLOCKED; static int driverfs_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev) { struct inode *inode = driverfs_get_inode(dir->i_sb, mode, dev); @@ -146,20 +147,20 @@ static int driverfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) { int res; - lock_kernel(); dentry->d_op = &driverfs_dentry_dir_ops; + spin_lock(&driverfs_mknod_lock); res = driverfs_mknod(dir, dentry, mode | S_IFDIR, 0); - unlock_kernel(); + spin_unlock(&driverfs_mknod_lock); return res; } static int driverfs_create(struct inode *dir, struct dentry *dentry, int mode) { int res; - lock_kernel(); dentry->d_op = &driverfs_dentry_file_ops; + spin_lock(&driverfs_mknod_lock); res = driverfs_mknod(dir, dentry, mode | S_IFREG, 0); - unlock_kernel(); + spin_unlock(&driverfs_mknod_lock); return res; } @@ -211,9 +212,9 @@ if (driverfs_empty(dentry)) { struct inode *inode = dentry->d_inode; - lock_kernel(); + down(&inode->i_sem); inode->i_nlink--; - unlock_kernel(); + up(&inode->i_sem); dput(dentry); error = 0; } @@ -353,8 +354,9 @@ driverfs_file_lseek(struct file *file, loff_t offset, int orig) { loff_t retval = -EINVAL; + struct inode *inode = file->f_dentry->d_inode->i_mapping->host; - lock_kernel(); + down(&inode->i_sem); switch(orig) { case 0: if (offset > 0) { @@ -371,7 +373,7 @@ default: break; } - unlock_kernel(); + up(&inode->i_sem); return retval; }