From patchwork Fri Jun 29 18:57:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1133301 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D790FDFF34 for ; Fri, 29 Jun 2012 19:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932715Ab2F2TBi (ORCPT ); Fri, 29 Jun 2012 15:01:38 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:46821 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932689Ab2F2S6T (ORCPT ); Fri, 29 Jun 2012 14:58:19 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so3038060yen.19 for ; Fri, 29 Jun 2012 11:58:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=b5KNS/KG16MqbN1OaGZYy6DWv+bYd463bsdAGXANOe0=; b=N7z7GL0pPwYGq23+AQZKlIq7mShc6Q+4mUCJhXBQ6dCTOwCKec+P58tLlAir748VIl pGWF71OolVPlE5uWHDDY+3VliBA2a6+U8gkFmlWynINy8Z3zLyRm8gyQ+iCEVTYqHgbF Bfs7JfNpoZdLNA9qqzQG6CSq6L3vaFI9GgFtOcHhVUreRBH80Cx4SPp19r88Ji9e1AN9 5t7Hi0NUb2IpLJOCBBltQu07EUJqk0CpiTkbT3E5TG4jGujO4dPAqnIFl6ejLGHXDzM7 PGrQh4vh+cGMeSQ5zrpDfuTZhC1sy5CB7+o6MKXEigMPAdGwo19Kgheq4/7Pi/7zblHy 25Wg== Received: by 10.236.190.138 with SMTP id e10mr4528292yhn.131.1340996299067; Fri, 29 Jun 2012 11:58:19 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id l13sm3936309ann.2.2012.06.29.11.58.17 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 11:58:18 -0700 (PDT) From: Jeff Layton To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com Subject: [PATCH v3 08/17] vfs: fix mknodat to retry on ESTALE errors Date: Fri, 29 Jun 2012 14:57:51 -0400 Message-Id: <1340996280-27123-9-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkTgVhJxYVZSM/+4tEaT1FCLB2tpGxQyfn3ZqKpENwN+GIWfrrv8ZNJLC/cuSJmXu5wLne0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/namei.c | 68 +++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 28 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 86aa8ee..ef3ccee 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2656,44 +2656,56 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, struct dentry *dentry; struct path path; int error; + char *name; + unsigned int try = 0; if (S_ISDIR(mode)) return -EPERM; - dentry = user_path_create(dfd, filename, &path, 0); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); + name = getname(filename); + if (IS_ERR(name)) + return PTR_ERR(name); - if (!IS_POSIXACL(path.dentry->d_inode)) - mode &= ~current_umask(); - error = may_mknod(mode); - if (error) - goto out_dput; - error = mnt_want_write(path.mnt); - if (error) - goto out_dput; - error = security_path_mknod(&path, dentry, mode, dev); - if (error) - goto out_drop_write; - switch (mode & S_IFMT) { - case 0: case S_IFREG: - error = vfs_create(path.dentry->d_inode,dentry,mode,NULL); + do { + dentry = kern_path_create(dfd, name, &path, false, try); + if (IS_ERR(dentry)) + return PTR_ERR(dentry); + + if (!IS_POSIXACL(path.dentry->d_inode)) + mode &= ~current_umask(); + error = may_mknod(mode); + if (error) + goto out_dput; + error = mnt_want_write(path.mnt); + if (error) + goto out_dput; + error = security_path_mknod(&path, dentry, mode, dev); + if (error) + goto out_drop_write; + switch (mode & S_IFMT) { + case 0: + case S_IFREG: + error = vfs_create(path.dentry->d_inode, dentry, + mode, NULL); break; - case S_IFCHR: case S_IFBLK: - error = vfs_mknod(path.dentry->d_inode,dentry,mode, + case S_IFCHR: + case S_IFBLK: + error = vfs_mknod(path.dentry->d_inode, dentry, mode, new_decode_dev(dev)); break; - case S_IFIFO: case S_IFSOCK: - error = vfs_mknod(path.dentry->d_inode,dentry,mode,0); - break; - } + case S_IFIFO: + case S_IFSOCK: + error = vfs_mknod(path.dentry->d_inode, dentry, + mode, 0); + } out_drop_write: - mnt_drop_write(path.mnt); + mnt_drop_write(path.mnt); out_dput: - dput(dentry); - mutex_unlock(&path.dentry->d_inode->i_mutex); - path_put(&path); - + dput(dentry); + mutex_unlock(&path.dentry->d_inode->i_mutex); + path_put(&path); + } while (retry_estale(error, try++)); + putname(name); return error; }