lkml.org 
[lkml]   [2012]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 20/21] vfs: do_last(): clean up retry
Date
From: Miklos Szeredi <mszeredi@suse.cz>

Move the lookup retry logic to the bottom of the function to make the normal
case simpler to read.

Reported-by: David Howells <dhowells@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---
fs/namei.c | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 7d87c63..d5dd6fb 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2605,22 +2605,11 @@ finish_open_created:
goto exit;
od->mnt = nd->path.mnt;
filp = finish_open(od, nd->path.dentry, NULL);
- if (filp == ERR_PTR(-EOPENSTALE) && save_parent.dentry && !retried) {
- BUG_ON(save_parent.dentry != dir);
- path_put(&nd->path);
- nd->path = save_parent;
- nd->inode = dir->d_inode;
- save_parent.mnt = NULL;
- save_parent.dentry = NULL;
- if (want_write) {
- mnt_drop_write(nd->path.mnt);
- want_write = false;
- }
- retried = true;
- goto retry_lookup;
- }
- if (IS_ERR(filp))
+ if (IS_ERR(filp)) {
+ if (filp == ERR_PTR(-EOPENSTALE))
+ goto stale_open;
goto out;
+ }
error = open_check_o_direct(filp);
if (error)
goto exit_fput;
@@ -2650,6 +2639,23 @@ exit_fput:
fput(filp);
goto exit;

+stale_open:
+ /* If no saved parent or already retried then can't retry */
+ if (!save_parent.dentry || retried)
+ goto out;
+
+ BUG_ON(save_parent.dentry != dir);
+ path_put(&nd->path);
+ nd->path = save_parent;
+ nd->inode = dir->d_inode;
+ save_parent.mnt = NULL;
+ save_parent.dentry = NULL;
+ if (want_write) {
+ mnt_drop_write(nd->path.mnt);
+ want_write = false;
+ }
+ retried = true;
+ goto retry_lookup;
}

static struct file *path_openat(int dfd, const char *pathname,
--
1.7.7


\
 
 \ /
  Last update: 2012-06-05 16:01    [W:0.156 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site