lkml.org 
[lkml]   [2012]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 19/34] vfs: do_last(): common slow lookup
Date
From: Miklos Szeredi <mszeredi@suse.cz>

Make the slow lookup part of O_CREAT and non-O_CREAT opens common.

This allows atomic_open to be hooked into the slow lookup part.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/namei.c | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index f89827a..a7a9c2e 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2272,30 +2272,13 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
symlink_ok = 1;
/* we _can_ be in RCU mode here */
error = lookup_fast(nd, &nd->last, path, &inode);
- if (unlikely(error)) {
- if (error < 0)
- goto exit;
-
- BUG_ON(nd->inode != dir->d_inode);
-
- mutex_lock(&dir->d_inode->i_mutex);
- dentry = __lookup_hash(&nd->last, dir, nd);
- mutex_unlock(&dir->d_inode->i_mutex);
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
- goto exit;
- path->mnt = nd->path.mnt;
- path->dentry = dentry;
- error = follow_managed(path, nd->flags);
- if (unlikely(error < 0))
- goto exit_dput;
+ if (likely(!error))
+ goto finish_lookup;

- if (error)
- nd->flags |= LOOKUP_JUMPED;
+ if (error < 0)
+ goto exit;

- inode = path->dentry->d_inode;
- }
- goto finish_lookup;
+ BUG_ON(nd->inode != dir->d_inode);
} else {
/* create side of things */
/*
--
1.7.7


\
 
 \ /
  Last update: 2012-04-05 17:05    [W:0.706 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site