From: Valerie Aurora <valerie.aurora@gmail.com>
To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org
Cc: viro@zeniv.linux.org.uk, Valerie Aurora <vaurora@redhat.com>,
Valerie Aurora <valerie.aurora@gmail.com>
Subject: [PATCH 63/74] union-mount: In-kernel file copyup routines
Date: Tue, 22 Mar 2011 19:04:54 -0700 [thread overview]
Message-ID: <1300845905-14433-20-git-send-email-valerie.aurora@gmail.com> (raw)
In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com>
From: Valerie Aurora <vaurora@redhat.com>
When a file on the read-only layer of a union mount is altered, it
must be copied up to the topmost read-write layer. This patch creates
union_copyup() and its supporting routines.
Thanks to Valdis Kletnieks <Valdis.Kletnieks@vt.edu> for a bug fix.
XXX - split up
XXX - If dir xattr copyup fails, delete the newly created dir
XXX - set correct owner after copyup
XXX - reimplement with get_unlinked_inode()
Signed-off-by: Valerie Aurora <valerie.aurora@gmail.com>
---
fs/union.c | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
fs/union.h | 6 +
2 files changed, 330 insertions(+), 2 deletions(-)
diff --git a/fs/union.c b/fs/union.c
index 2fdc095..33d7a4c 100644
--- a/fs/union.c
+++ b/fs/union.c
@@ -24,6 +24,8 @@
#include <linux/namei.h>
#include <linux/file.h>
#include <linux/security.h>
+#include <linux/splice.h>
+#include <linux/xattr.h>
#include "union.h"
@@ -97,6 +99,72 @@ int union_add_dir(struct path *topmost, struct path *lower,
}
/**
+ * union_copyup_xattr
+ *
+ * @old: dentry of original file
+ * @new: dentry of new copy
+ *
+ * Copy up extended attributes from the original file to the new one.
+ *
+ * XXX - Permissions? For now, copying up every xattr.
+ */
+
+static int union_copyup_xattr(struct dentry *old, struct dentry *new)
+{
+ ssize_t list_size, size;
+ char *buf, *name, *value;
+ int error;
+
+ /* Check for xattr support */
+ if (!old->d_inode->i_op->getxattr ||
+ !new->d_inode->i_op->getxattr)
+ return 0;
+
+ /* Find out how big the list of xattrs is */
+ list_size = vfs_listxattr(old, NULL, 0);
+ if (list_size <= 0)
+ return list_size;
+
+ /* Allocate memory for the list */
+ buf = kzalloc(list_size, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ /* Allocate memory for the xattr's value */
+ error = -ENOMEM;
+ value = kmalloc(XATTR_SIZE_MAX, GFP_KERNEL);
+ if (!value)
+ goto out;
+
+ /* Actually get the list of xattrs */
+ list_size = vfs_listxattr(old, buf, list_size);
+ if (list_size <= 0) {
+ error = list_size;
+ goto out_free_value;
+ }
+
+ for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
+ /* XXX Locking? old is on read-only fs */
+ size = vfs_getxattr(old, name, value, XATTR_SIZE_MAX);
+ if (size <= 0) {
+ error = size;
+ goto out_free_value;
+ }
+ /* XXX do we really need to check for size overflow? */
+ /* XXX locks new dentry, lock ordering problems? */
+ error = vfs_setxattr(new, name, value, size, 0);
+ if (error)
+ goto out_free_value;
+ }
+
+out_free_value:
+ kfree(value);
+out:
+ kfree(buf);
+ return error;
+}
+
+/**
* union_create_topmost_dir - Create a matching dir in the topmost file system
*
* @parent - parent of target on topmost layer
@@ -140,12 +208,18 @@ int union_create_topmost_dir(struct path *parent, struct qstr *name,
error = union_copyup_xattr(lower->dentry, topmost->dentry);
if (error)
- dput(topmost->dentry);
+ goto out_rmdir;
fsnotify_mkdir(dir, topmost->dentry);
-out:
+
mnt_drop_write(parent->mnt);
+ return 0;
+out_rmdir:
+ /* XXX rm created dir */
+ dput(topmost->dentry);
+out:
+ mnt_drop_write(parent->mnt);
return error;
}
@@ -390,3 +464,251 @@ generic_readdir_fallthru(struct dentry *topmost_dentry, const char *name,
}
return -ENOENT;
}
+
+/**
+ * union_create_file
+ *
+ * @nd: namediata for source file
+ * @old: path of the source file
+ * @new: path of the new file, negative dentry
+ *
+ * Must already have mnt_want_write() on the mnt and the parent's
+ * i_mutex.
+ */
+
+static int union_create_file(struct nameidata *nd, struct path *old,
+ struct dentry *new)
+{
+ struct path *parent = &nd->path;
+ BUG_ON(!mutex_is_locked(&parent->dentry->d_inode->i_mutex));
+
+ return vfs_create(parent->dentry->d_inode, new,
+ old->dentry->d_inode->i_mode, nd);
+}
+
+/**
+ * union_create_symlink
+ *
+ * @nd: namediata for source symlink
+ * @old: path of the source symlink
+ * @new: path of the new symlink, negative dentry
+ *
+ * Must already have mnt_want_write() on the mnt and the parent's
+ * i_mutex.
+ */
+
+static int union_create_symlink(struct nameidata *nd, struct path *old,
+ struct dentry *new)
+{
+ void *cookie;
+ int error;
+
+ BUG_ON(!mutex_is_locked(&nd->path.dentry->d_inode->i_mutex));
+ /*
+ * We want the contents of this symlink, not to follow it, so
+ * this is modeled on generic_readlink() rather than
+ * do_follow_link().
+ */
+ nd->depth = 0;
+ cookie = old->dentry->d_inode->i_op->follow_link(old->dentry, nd);
+ if (IS_ERR(cookie))
+ return PTR_ERR(cookie);
+ /* Create a copy of the link on the top layer */
+ error = vfs_symlink(nd->path.dentry->d_inode, new,
+ nd_get_link(nd));
+ if (old->dentry->d_inode->i_op->put_link)
+ old->dentry->d_inode->i_op->put_link(old->dentry, nd, cookie);
+ return error;
+}
+
+/**
+ * union_copyup_data - Copy up len bytes of old's data to new
+ *
+ * @old: path of source file
+ * @new_mnt: vfsmount of target file
+ * @new_dentry: dentry of target file
+ * @len: number of bytes to copy
+ */
+
+static int union_copyup_data(struct path *old, struct vfsmount *new_mnt,
+ struct dentry *new_dentry, size_t len)
+{
+ struct file *old_file;
+ struct file *new_file;
+ const struct cred *cred = current_cred();
+ loff_t offset = 0;
+ long bytes;
+ int error = 0;
+
+ if (len == 0)
+ return 0;
+
+ /* Get reference to balance later fput() */
+ path_get(old);
+ old_file = dentry_open(old->dentry, old->mnt, O_RDONLY, cred);
+ if (IS_ERR(old_file))
+ return PTR_ERR(old_file);
+
+ mntget(new_mnt);
+ dget(new_dentry);
+ new_file = dentry_open(new_dentry, new_mnt, O_WRONLY, cred);
+ if (IS_ERR(new_file)) {
+ error = PTR_ERR(new_file);
+ goto out_fput;
+ }
+
+ bytes = do_splice_direct(old_file, &offset, new_file, len,
+ SPLICE_F_MOVE);
+ if (bytes < 0)
+ error = bytes;
+
+ fput(new_file);
+out_fput:
+ fput(old_file);
+ return error;
+}
+
+/**
+ * __union_copyup_len - Copy up a file and len bytes of data
+ *
+ * @nd: nameidata for topmost parent dir
+ * @path: path of file to be copied up
+ * @len: number of bytes of file data to copy up
+ *
+ * Parent's i_mutex must be held by caller. Newly copied up path is
+ * returned in @path and original is path_put().
+ */
+
+static int __union_copyup_len(struct nameidata *nd, struct path *path,
+ size_t len)
+{
+ struct path *parent = &nd->path;
+ struct dentry *dentry;
+ int error;
+
+ BUG_ON(!mutex_is_locked(&parent->dentry->d_inode->i_mutex));
+
+ dentry = lookup_one_len(path->dentry->d_name.name, parent->dentry,
+ path->dentry->d_name.len);
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
+
+ if (dentry->d_inode) {
+ /*
+ * We raced with someone else and "lost." That's
+ * okay, they did all the work of copying up the file.
+ * Note that currently data copyup happens under the
+ * parent dir's i_mutex. If we move it outside that,
+ * we'll need some way of waiting for the data copyup
+ * to complete here.
+ */
+ error = 0;
+ goto out_newpath;
+ }
+ if (S_ISREG(path->dentry->d_inode->i_mode)) {
+ /* Create file */
+ error = union_create_file(nd, path, dentry);
+ if (error)
+ goto out_dput;
+ /* Copyup data */
+ error = union_copyup_data(path, parent->mnt, dentry, len);
+ } else {
+ BUG_ON(!S_ISLNK(path->dentry->d_inode->i_mode));
+ error = union_create_symlink(nd, path, dentry);
+ }
+ if (error) {
+ /* Most likely error: ENOSPC */
+ vfs_unlink(parent->dentry->d_inode, dentry);
+ goto out_dput;
+ }
+ /* XXX Copyup xattrs and any other dangly bits */
+ error = union_copyup_xattr(path->dentry, dentry);
+ if (error)
+ goto out_dput;
+out_newpath:
+ /* path_put() of original must happen before we copy in new */
+ path_put(path);
+ path->dentry = dentry;
+ path->mnt = mntget(parent->mnt);
+ return error;
+out_dput:
+ /* Don't path_put(path), let caller unwind */
+ dput(dentry);
+ return error;
+}
+
+/**
+ * do_union_copyup_len - Copy up a file given its path (and its parent's)
+ *
+ * @nd: nameidata for topmost parent dir
+ * @path: path of file to be copied up
+ * @copy_all: if set, copy all of the file's data and ignore @len
+ * @len: if @copy_all is not set, number of bytes of file data to copy up
+ *
+ * Newly copied up path is returned in @path.
+ */
+
+static int do_union_copyup_len(struct nameidata *nd, struct path *path,
+ int copy_all, size_t len)
+{
+ struct path *parent = &nd->path;
+ int error;
+
+ if (!IS_DIR_UNIONED(parent->dentry))
+ return 0;
+ if (parent->mnt == path->mnt)
+ return 0;
+ if (!S_ISREG(path->dentry->d_inode->i_mode) &&
+ !S_ISLNK(path->dentry->d_inode->i_mode))
+ return 0;
+
+ BUG_ON(!S_ISDIR(parent->dentry->d_inode->i_mode));
+
+ mutex_lock(&parent->dentry->d_inode->i_mutex);
+ error = -ENOENT;
+ if (IS_DEADDIR(parent->dentry->d_inode))
+ goto out_unlock;
+
+ if (copy_all && S_ISREG(path->dentry->d_inode->i_mode)) {
+ error = -EFBIG;
+ len = i_size_read(path->dentry->d_inode);
+ /* Check for overflow of file size */
+ if (((size_t)len != len) || ((ssize_t)len != len))
+ goto out_unlock;
+ }
+
+ error = __union_copyup_len(nd, path, len);
+
+out_unlock:
+ mutex_unlock(&parent->dentry->d_inode->i_mutex);
+ return error;
+}
+
+/*
+ * Helper function to copy up all of a file
+ */
+int union_copyup(struct nameidata *nd, struct path *path)
+{
+ return do_union_copyup_len(nd, path, 1, 0);
+}
+
+/*
+ * Unlocked helper function to copy up all of a file
+ */
+int __union_copyup(struct nameidata *nd, struct path *path)
+{
+ size_t len;
+ len = i_size_read(path->dentry->d_inode);
+ if (((size_t)len != len) || ((ssize_t)len != len))
+ return -EFBIG;
+
+ return __union_copyup_len(nd, path, len);
+}
+
+/*
+ * Helper function to copy up part of a file
+ */
+int union_copyup_len(struct nameidata *nd, struct path *path, size_t len)
+{
+ return do_union_copyup_len(nd, path, 0, len);
+}
diff --git a/fs/union.h b/fs/union.h
index 4620cc1..0fcc302 100644
--- a/fs/union.h
+++ b/fs/union.h
@@ -59,6 +59,9 @@ extern int union_create_topmost_dir(struct path *, struct qstr *, struct path *,
extern int union_copyup_dir(struct path *);
extern int generic_readdir_fallthru(struct dentry *topmost_dentry, const char *name,
int namlen, ino_t *ino, unsigned char *d_type);
+extern int union_copyup(struct nameidata *, struct path *);
+extern int __union_copyup(struct nameidata *, struct path *);
+extern int union_copyup_len(struct nameidata *, struct path *, size_t len);
static inline int needs_lookup_union(struct path *parent_path, struct path *path)
{
@@ -93,6 +96,9 @@ static inline struct path *union_find_dir(struct dentry *dentry,
#define needs_lookup_union(x, y) ({ (0); })
#define union_copyup_dir(x) ({ BUG(); (0); })
#define generic_readdir_fallthru(w, x, y, z) ({ BUG(); (0); })
+#define union_copyup(x, y) ({ BUG(); (0); })
+#define __union_copyup(x, y) ({ BUG(); (0); })
+#define union_copyup_len(x, y, z) ({ BUG(); (0); })
#endif /* CONFIG_UNION_MOUNT */
#endif /* __KERNEL__ */
--
1.7.0.4
next prev parent reply other threads:[~2011-03-23 2:06 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 2:04 [PATCH 44/74] union-mount: Temporarily disable some syscalls Valerie Aurora
2011-03-23 2:04 ` [PATCH 45/74] union-mount: Basic infrastructure of __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 46/74] union-mount: Process negative dentries in __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 47/74] union-mount: Return files found in lower layers " Valerie Aurora
2011-03-23 2:04 ` [PATCH 48/74] union-mount: Build union stack " Valerie Aurora
2011-03-23 2:04 ` [PATCH 49/74] union-mount: Follow mount " Valerie Aurora
2011-03-23 2:04 ` [PATCH 50/74] union-mount: Add lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 51/74] union-mount: Add do_lookup_union() wrapper for __lookup_union() Valerie Aurora
2011-03-23 2:04 ` [PATCH 52/74] union-mount: Call union lookup functions in lookup path Valerie Aurora
2011-03-23 2:04 ` [PATCH 53/74] union-mount: Create whiteout on unlink() Valerie Aurora
2011-03-23 2:04 ` [PATCH 54/74] union-mount: Create whiteout on rmdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 55/74] union-mount: Set opaque flag on new directories in unioned file systems Valerie Aurora
2011-03-23 2:04 ` [PATCH 56/74] union-mount: Copy up directory entries on first readdir() Valerie Aurora
2011-03-23 2:04 ` [PATCH 57/74] union-mount: Add generic_readdir_fallthru() helper Valerie Aurora
2011-03-23 2:04 ` [PATCH 58/74] fallthru: ext2 support for lookup of d_type/d_ino in fallthrus Valerie Aurora
2011-03-23 2:04 ` [PATCH 59/74] fallthru: tmpfs " Valerie Aurora
2011-03-23 2:04 ` [PATCH 60/74] fallthru: jffs2 " Valerie Aurora
2011-03-23 2:04 ` [PATCH 61/74] VFS: Split inode_permission() and create path_permission() Valerie Aurora
2011-03-23 2:04 ` [PATCH 62/74] VFS: Create user_path_nd() to lookup both parent and target Valerie Aurora
2011-03-23 2:04 ` Valerie Aurora [this message]
2011-03-23 2:04 ` [PATCH 64/74] union-mount: Implement union-aware access()/faccessat() Valerie Aurora
2011-03-23 2:04 ` [PATCH 65/74] union-mount: Implement union-aware link() Valerie Aurora
2011-03-23 2:04 ` [PATCH 66/74] union-mount: Implement union-aware rename() Valerie Aurora
2011-03-23 2:04 ` [PATCH 67/74] union-mount: Implement union-aware writable open() Valerie Aurora
2011-03-23 2:04 ` [PATCH 68/74] union-mount: Implement union-aware chown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 69/74] union-mount: Implement union-aware truncate() Valerie Aurora
2011-03-23 2:05 ` [PATCH 70/74] union-mount: Implement union-aware chmod()/fchmodat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 71/74] union-mount: Implement union-aware lchown() Valerie Aurora
2011-03-23 2:05 ` [PATCH 72/74] union-mount: Implement union-aware utimensat() Valerie Aurora
2011-03-23 2:05 ` [PATCH 73/74] union-mount: Implement union-aware setxattr() Valerie Aurora
2011-03-23 2:05 ` [PATCH 74/74] union-mount: Implement union-aware lsetxattr() Valerie Aurora
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300845905-14433-20-git-send-email-valerie.aurora@gmail.com \
--to=valerie.aurora@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux@vger.kernel.org \
--cc=vaurora@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).