From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 31/49] vfs: make do_unlinkat retry on ESTALE errors Date: Mon, 1 Oct 2012 20:16:40 -0400 Message-ID: <1349137018-21948-32-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org To: viro@ZenIV.linux.org.uk Return-path: In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Jeff Layton --- fs/namei.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/namei.c b/fs/namei.c index 0d0b1c0..f311ed1 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3450,8 +3450,11 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_PARENT; - name = user_path_parent(dfd, pathname, &nd, 0); +retry: + name = user_path_parent(dfd, pathname, &nd, try); if (IS_ERR(name)) return PTR_ERR(name); @@ -3489,6 +3492,10 @@ exit2: exit1: path_put(&nd.path); putname(name); + if (retry_estale(error, try++)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } return error; slashes: -- 1.7.11.4