[PATCH 31/38] union-mount: Implement union-aware writable open()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Valerie Aurora
Date: Tuesday, June 15, 2010 - 11:40 am

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 6096413..7514096 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1907,6 +1907,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)
@@ -1958,6 +1976,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;
@@ -2029,6 +2052,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

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/38] Union mounts - union stack as linked list, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 01/38] VFS: Comment follow_mount() and friends, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 02/38] VFS: Make lookup_hash() return a struct path, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 03/38] VFS: Add read-only users count to superblock, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 09/38] whiteout: tmpfs whiteout support, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 11/38] whiteout: ext2 whiteout support, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 12/38] whiteout: jffs2 whiteout support, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 14/38] fallthru: ext2 fallthru support, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 16/38] fallthru: tmpfs fallthru support, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 17/38] union-mount: Union mounts documentation, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 22/38] union-mount: Implement union lookup, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 27/38] union-mount: In-kernel file copyup routines, Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 29/38] union-mount: Implement union-aware link(), Valerie Aurora, (Tue Jun 15, 11:39 am)
[PATCH 30/38] union-mount: Implement union-aware rename(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 31/38] union-mount: Implement union-aware writable ..., Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 32/38] union-mount: Implement union-aware chown(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 33/38] union-mount: Implement union-aware truncate(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 35/38] union-mount: Implement union-aware lchown(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 36/38] union-mount: Implement union-aware utimensat(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 37/38] union-mount: Implement union-aware setxattr(), Valerie Aurora, (Tue Jun 15, 11:40 am)
[PATCH 38/38] union-mount: Implement union-aware lsetxattr(), Valerie Aurora, (Tue Jun 15, 11:40 am)
Re: [PATCH 17/38] union-mount: Union mounts documentation, Valerie Aurora, (Thu Jun 17, 11:39 am)
Re: [PATCH 17/38] union-mount: Union mounts documentation, Valerie Aurora, (Fri Jun 18, 2:06 pm)
Re: [PATCH 17/38] union-mount: Union mounts documentation, Miklos Szeredi, (Mon Jun 21, 6:14 am)
Re: [PATCH 17/38] union-mount: Union mounts documentation, Valerie Aurora, (Mon Jun 21, 4:17 pm)
Re: [PATCH 11/38] whiteout: ext2 whiteout support, Ian Kent, (Mon Jul 12, 9:24 pm)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Ian Kent, (Mon Jul 12, 9:30 pm)
Re: [PATCH 22/38] union-mount: Implement union lookup, Valerie Aurora, (Mon Jul 19, 2:58 pm)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Miklos Szeredi, (Wed Aug 4, 7:44 am)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Valerie Aurora, (Wed Aug 4, 3:48 pm)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Miklos Szeredi, (Thu Aug 5, 3:36 am)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Miklos Szeredi, (Thu Aug 5, 4:13 am)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Valerie Aurora, (Thu Aug 5, 4:30 pm)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Valerie Aurora, (Fri Aug 6, 10:12 am)
Re: [PATCH 14/38] fallthru: ext2 fallthru support, Valerie Aurora, (Fri Aug 6, 10:16 am)