From 3073a3397f815c6127419a224b98ba3f9b6b1288 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Tue, 24 Jun 2008 16:50:15 +0200 Subject: [PATCH] --- yaml --- r: 106359 b: refs/heads/master c: 7e79eedb3b22200cc8b774baea3a7bf28d766101 h: refs/heads/master i: 106357: 94b87e8a79098bdc4664d96cc45a36c5e9c3bf14 106355: d734fca037a6c7f64e729f2a1bb9fbb9594fe5de 106351: 8b433d23dc6a3e0c4a7bb99c545f4c1f1a11e213 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 30081772dbfa..747ede4d189e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f1936b87783a3a56c9441b27b9ba7a747f11e8e +refs/heads/master: 7e79eedb3b22200cc8b774baea3a7bf28d766101 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 46af98ed136b..3b67be7631dc 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -2524,19 +2524,19 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de return -EPERM; if (!dir->i_op || !dir->i_op->link) return -EPERM; - if (S_ISDIR(old_dentry->d_inode->i_mode)) + if (S_ISDIR(inode->i_mode)) return -EPERM; error = security_inode_link(old_dentry, dir, new_dentry); if (error) return error; - mutex_lock(&old_dentry->d_inode->i_mutex); + mutex_lock(&inode->i_mutex); DQUOT_INIT(dir); error = dir->i_op->link(old_dentry, dir, new_dentry); - mutex_unlock(&old_dentry->d_inode->i_mutex); + mutex_unlock(&inode->i_mutex); if (!error) - fsnotify_link(dir, old_dentry->d_inode, new_dentry); + fsnotify_link(dir, inode, new_dentry); return error; }