lkml.org 
[lkml]   [2012]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] fs/namei.c: only check mountpoint on non-negative dentry
Date

Signed-off-by: yan <clouds.yan@gmail.com>
---
fs/namei.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index dd1ed1b..028f5c8 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3628,11 +3628,15 @@ static int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
return error;

dget(new_dentry);
- if (target)
- mutex_lock(&target->i_mutex);

error = -EBUSY;
- if (d_mountpoint(old_dentry) || d_mountpoint(new_dentry))
+ if (target){
+ mutex_lock(&target->i_mutex);
+ if (d_mountpoint(new_dentry))
+ goto out;
+ }
+
+ if (d_mountpoint(old_dentry))
goto out;

error = -EMLINK;
@@ -3671,11 +3675,15 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
return error;

dget(new_dentry);
- if (target)
- mutex_lock(&target->i_mutex);

error = -EBUSY;
- if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry))
+ if (target){
+ mutex_lock(&target->i_mutex);
+ if (d_mountpoint(new_dentry))
+ goto out;
+ }
+
+ if (d_mountpoint(old_dentry))
goto out;

error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
--
1.7.9.5


\
 
 \ /
  Last update: 2012-08-24 14:21    [W:0.303 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site