From patchwork Mon Nov 5 15:21:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1699131 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 4BA72DF2AB for ; Mon, 5 Nov 2012 15:35:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932798Ab2KEPfw (ORCPT ); Mon, 5 Nov 2012 10:35:52 -0500 Received: from mail-ye0-f174.google.com ([209.85.213.174]:52182 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932804Ab2KEPWa (ORCPT ); Mon, 5 Nov 2012 10:22:30 -0500 Received: by mail-ye0-f174.google.com with SMTP id m12so1017184yen.19 for ; Mon, 05 Nov 2012 07:22:30 -0800 (PST) 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=rMkRoYhRB0iDL4tMLeTFqlBFdsSAy8zXHuvGbBVavLU=; b=KrbLl5A8RjiCcspn6BSV1IwBMn4SWVObUIjQAFBAV/TYNE0/eMlo8cjWu4ZPIaBiqt YN+k+aCz+RVCzuNkjZrWYOSjE7oqxGzIlqX1b9MPU1504L5GwEKy9VE6TExqejtiic4s hhCxsU1FcUiQ3M9zQOD0VGzrKGgGCh23cGGXQruGK4LG1/0QBvJ3N8qe9rLStXklPe3N gyco4FsQZ4fLB/1yuyVdOOyWqf3dEIEykI8KHMpYetyI27wL8KdUBknuzRV9jG2QLMni epJ7p/AwQEaCg67moGVgDKGfqfip3ZfgoVPDXbBHNOaCCpapQsImlFSpGwMDg+cJRY+r KMZw== Received: by 10.236.121.98 with SMTP id q62mr9454053yhh.8.1352128949963; Mon, 05 Nov 2012 07:22:29 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id y18sm12026769anh.15.2012.11.05.07.22.28 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:22:29 -0800 (PST) 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 v9 05/34] vfs: fix mknodat to retry on ESTALE errors Date: Mon, 5 Nov 2012 10:21:44 -0500 Message-Id: <1352128933-28526-6-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQlrrV0N0rN5zrJIywYPJ5WLqbxeZCv6NCURvFebGlaDxHONiDaur/zNrUkjTjB0kpcPBrzp 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 | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 8618a47..7311968 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3177,34 +3177,41 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, struct dentry *dentry; struct path path; int error; + unsigned int try = 0; error = may_mknod(mode); if (error) return error; - dentry = user_path_create(dfd, filename, &path, false, false); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); + do { + dentry = user_path_create(dfd, filename, &path, false, try); + if (IS_ERR(dentry)) + return PTR_ERR(dentry); - if (!IS_POSIXACL(path.dentry->d_inode)) - mode &= ~current_umask(); - error = security_path_mknod(&path, dentry, mode, dev); - if (error) - goto out; - switch (mode & S_IFMT) { - case 0: case S_IFREG: - error = vfs_create(path.dentry->d_inode,dentry,mode,true); + if (!IS_POSIXACL(path.dentry->d_inode)) + mode &= ~current_umask(); + error = security_path_mknod(&path, dentry, mode, dev); + if (error) + goto out; + switch (mode & S_IFMT) { + case 0: + case S_IFREG: + error = vfs_create(path.dentry->d_inode, dentry, + mode, true); 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: - done_path_create(&path, dentry); + done_path_create(&path, dentry); + } while (retry_estale(error, try++)); return error; }