Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932534Ab0FYTIb (ORCPT ); Fri, 25 Jun 2010 15:08:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56258 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932484Ab0FYTHZ (ORCPT ); Fri, 25 Jun 2010 15:07:25 -0400 From: Valerie Aurora To: Alexander Viro Cc: Miklos Szeredi , Jan Blunck , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora Subject: [PATCH 31/38] union-mount: Implement union-aware writable open() Date: Fri, 25 Jun 2010 12:05:21 -0700 Message-Id: <1277492728-11446-32-git-send-email-vaurora@redhat.com> In-Reply-To: <1277492728-11446-1-git-send-email-vaurora@redhat.com> References: <1277492728-11446-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1895 Lines: 67 Copy up a file when opened with write permissions. Does not copy up the file data when O_TRUNC is specified. --- fs/namei.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6662dda..9a3ba52 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1910,6 +1910,24 @@ exit: return ERR_PTR(error); } +static int open_union_copyup(struct nameidata *nd, struct path *path, + int open_flag) +{ + struct vfsmount *oldmnt = path->mnt; + int error; + + if (open_flag & O_TRUNC) + error = union_copyup_len(nd, path, 0); + else + error = union_copyup(nd, path); + if (error) + return error; + if (oldmnt != path->mnt) + mntput(nd->path.mnt); + + return error; +} + static struct file *do_last(struct nameidata *nd, struct path *path, int open_flag, int acc_mode, int mode, const char *pathname) @@ -1961,6 +1979,11 @@ static struct file *do_last(struct nameidata *nd, struct path *path, if (!path->dentry->d_inode->i_op->lookup) goto exit_dput; } + if (acc_mode & MAY_WRITE) { + error = open_union_copyup(nd, path, open_flag); + if (error) + goto exit_dput; + } path_to_nameidata(path, nd); audit_inode(pathname, nd->path.dentry); goto ok; @@ -2032,6 +2055,11 @@ static struct file *do_last(struct nameidata *nd, struct path *path, if (path->dentry->d_inode->i_op->follow_link) return NULL; + if (acc_mode & MAY_WRITE) { + error = open_union_copyup(nd, path, open_flag); + if (error) + goto exit_dput; + } path_to_nameidata(path, nd); error = -EISDIR; if (S_ISDIR(path->dentry->d_inode->i_mode)) -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/