From 4a1374a72459d8c8c49e3755fb7cb32d8729799d Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Thu, 20 Dec 2012 16:00:10 -0500 Subject: [PATCH] --- yaml --- r: 347843 b: refs/heads/master c: 972567f14cbcd437e9a88a73836bbc2ee0720b5f h: refs/heads/master i: 347841: b24bbaa8ec9c2aa59fd26ad8b87099e368540e47 347839: 829ff6e9dd801c902bcf1abb00d18fa53003ff49 v: v3 --- [refs] | 2 +- trunk/fs/namei.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 70225cd287e9..bcdb61788c0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ac12b4b6d707937f9de6d09622823b2fd0c93ef +refs/heads/master: 972567f14cbcd437e9a88a73836bbc2ee0720b5f diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 8f8e41f6eb52..b70c191b7e2b 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -3172,12 +3172,13 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, struct dentry *dentry; struct path path; int error; + unsigned int lookup_flags = 0; error = may_mknod(mode); if (error) return error; - - dentry = user_path_create(dfd, filename, &path, 0); +retry: + dentry = user_path_create(dfd, filename, &path, lookup_flags); if (IS_ERR(dentry)) return PTR_ERR(dentry); @@ -3200,6 +3201,10 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, } out: done_path_create(&path, dentry); + if (retry_estale(error, lookup_flags)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } return error; }