| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 May 2008 12:22:42 +0900
From: hooanon05@...oo.co.jp
To: linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Junjiro Okajima <hooanon05@...oo.co.jp>
Subject: [AUFS PATCH v2.6.26-rc2-mm1 12/39] aufs sub-VFS
From: Junjiro Okajima <hooanon05@...oo.co.jp>
initial commit
sub-routines or simple wrappers for VFS
Signed-off-by: Junjiro Okajima <hooanon05@...oo.co.jp>
---
fs/aufs/vfsub.c | 633 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/aufs/vfsub.h | 472 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 1105 insertions(+), 0 deletions(-)
create mode 100644 fs/aufs/vfsub.c
create mode 100644 fs/aufs/vfsub.h
diff --git a/fs/aufs/vfsub.c b/fs/aufs/vfsub.c
new file mode 100644
index 0000000..bc3ce64
--- /dev/null
+++ b/fs/aufs/vfsub.c
@@ -0,0 +1,633 @@
+/*
+ * Copyright (C) 2007-2008 Junjiro Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * sub-routines for VFS
+ */
+
+#include <linux/uaccess.h>
+#include "aufs.h"
+
+/* ---------------------------------------------------------------------- */
+
+void vfsub_args_init(struct vfsub_args *vargs, struct au_hin_ignore *ign,
+ int dlgt, int force_unlink)
+{
+ do_vfsub_args_reinit(vargs, ign);
+ vargs->flags = 0;
+ if (unlikely(dlgt))
+ vfsub_fset(vargs->flags, DLGT);
+ if (force_unlink)
+ vfsub_fset(vargs->flags, FORCE_UNLINK);
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct file *vfsub_filp_open(const char *path, int oflags, int mode)
+{
+ struct file *err;
+
+ LKTRTrace("%s\n", path);
+
+ lockdep_off();
+ err = filp_open(path, oflags, mode);
+ lockdep_on();
+ if (!IS_ERR(err))
+ au_update_fuse_h_inode(err->f_vfsmnt, err->f_dentry); /*ignore*/
+ return err;
+}
+
+int vfsub_path_lookup(const char *name, unsigned int flags,
+ struct nameidata *nd)
+{
+ int err;
+
+ LKTRTrace("%s\n", name);
+
+ /* lockdep_off(); */
+ err = path_lookup(name, flags, nd);
+ /* lockdep_on(); */
+ if (!err)
+ au_update_fuse_h_inode(nd->path.mnt, nd->path.dentry);
+ /*ignore*/
+ return err;
+}
+
+struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent,
+ int len)
+{
+ struct dentry *d;
+
+ LKTRTrace("%.*s/%.*s\n", AuDLNPair(parent), len, name);
+ IMustLock(parent->d_inode);
+
+ d = lookup_one_len(name, parent, len);
+ if (!IS_ERR(d))
+ au_update_fuse_h_inode(NULL, d); /*ignore*/
+ return d;
+}
+
+struct dentry *vfsub__lookup_hash(struct qstr *name, struct dentry *parent,
+ struct nameidata *nd)
+{
+ struct dentry *d;
+
+ LKTRTrace("%.*s/%.*s, nd %d\n",
+ AuDLNPair(parent), AuLNPair(name), !!nd);
+ if (nd)
+ LKTRTrace("nd{0x%x}\n", nd->flags);
+ IMustLock(parent->d_inode);
+
+ d = __lookup_hash(name, parent, nd);
+ if (!IS_ERR(d))
+ au_update_fuse_h_inode(NULL, d); /*ignore*/
+ return d;
+}
+
+/* ---------------------------------------------------------------------- */
+
+int do_vfsub_create(struct inode *dir, struct dentry *dentry, int mode,
+ struct nameidata *nd)
+{
+ int err;
+ struct vfsmount *mnt;
+
+ LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
+ IMustLock(dir);
+
+ err = vfs_create(dir, dentry, mode, nd);
+ if (!err) {
+ mnt = NULL;
+ if (nd)
+ mnt = nd->path.mnt;
+ /* dir inode is locked */
+ au_update_fuse_h_inode(mnt, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(mnt, dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_symlink(struct inode *dir, struct dentry *dentry,
+ const char *symname, int mode)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s, %s, 0x%x\n",
+ dir->i_ino, AuDLNPair(dentry), symname, mode);
+ IMustLock(dir);
+
+ err = vfs_symlink(dir, dentry, symname, mode);
+ if (!err) {
+ /* dir inode is locked */
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_mknod(struct inode *dir, struct dentry *dentry, int mode,
+ dev_t dev)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
+ IMustLock(dir);
+
+ err = vfs_mknod(dir, dentry, mode, dev);
+ if (!err) {
+ /* dir inode is locked */
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry)
+{
+ int err;
+
+ LKTRTrace("%.*s, i%lu, %.*s\n",
+ AuDLNPair(src_dentry), dir->i_ino, AuDLNPair(dentry));
+ IMustLock(dir);
+
+ lockdep_off();
+ err = vfs_link(src_dentry, dir, dentry);
+ lockdep_on();
+ if (!err) {
+ LKTRTrace("src_i %p, dst_i %p\n",
+ src_dentry->d_inode, dentry->d_inode);
+ /* fuse has different memory inode for the same inumber */
+ au_update_fuse_h_inode(NULL, src_dentry); /*ignore*/
+ /* dir inode is locked */
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_rename(struct inode *src_dir, struct dentry *src_dentry,
+ struct inode *dir, struct dentry *dentry)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s, i%lu, %.*s\n",
+ src_dir->i_ino, AuDLNPair(src_dentry),
+ dir->i_ino, AuDLNPair(dentry));
+ IMustLock(dir);
+ IMustLock(src_dir);
+
+ lockdep_off();
+ err = vfs_rename(src_dir, src_dentry, dir, dentry);
+ lockdep_on();
+ if (!err) {
+ /* dir inode is locked */
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, src_dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, src_dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
+ IMustLock(dir);
+
+ err = vfs_mkdir(dir, dentry, mode);
+ if (!err) {
+ /* dir inode is locked */
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ au_update_fuse_h_inode(NULL, dentry); /*ignore*/
+ }
+ return err;
+}
+
+int do_vfsub_rmdir(struct inode *dir, struct dentry *dentry)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s\n", dir->i_ino, AuDLNPair(dentry));
+ IMustLock(dir);
+
+ lockdep_off();
+ err = vfs_rmdir(dir, dentry);
+ lockdep_on();
+ /* dir inode is locked */
+ if (!err)
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ return err;
+}
+
+int do_vfsub_unlink(struct inode *dir, struct dentry *dentry)
+{
+ int err;
+
+ LKTRTrace("i%lu, %.*s\n", dir->i_ino, AuDLNPair(dentry));
+ IMustLock(dir);
+
+ /* vfs_unlink() locks inode */
+ lockdep_off();
+ err = vfs_unlink(dir, dentry);
+ lockdep_on();
+ /* dir inode is locked */
+ if (!err)
+ au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
+ssize_t do_vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
+ loff_t *ppos)
+{
+ ssize_t err;
+
+ LKTRTrace("%.*s, cnt %lu, pos %Ld\n",
+ AuDLNPair(file->f_dentry), (unsigned long)count, *ppos);
+
+ if (0 /*!au_test_nfs(file->f_vfsmnt->mnt_sb)*/)
+ err = vfs_read(file, ubuf, count, ppos);
+ else {
+ lockdep_off();
+ err = vfs_read(file, ubuf, count, ppos);
+ lockdep_on();
+ }
+ if (err >= 0)
+ au_update_fuse_h_inode(file->f_vfsmnt, file->f_dentry);
+ /*ignore*/
+ return err;
+}
+
+/* todo: kernel_read()? */
+ssize_t do_vfsub_read_k(struct file *file, void *kbuf, size_t count,
+ loff_t *ppos)
+{
+ ssize_t err;
+ mm_segment_t oldfs;
+
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+ err = do_vfsub_read_u(file, (char __user *)kbuf, count, ppos);
+ set_fs(oldfs);
+ return err;
+}
+
+ssize_t do_vfsub_write_u(struct file *file, const char __user *ubuf,
+ size_t count, loff_t *ppos)
+{
+ ssize_t err;
+
+ LKTRTrace("%.*s, cnt %lu, pos %Ld\n",
+ AuDLNPair(file->f_dentry), (unsigned long)count, *ppos);
+
+ lockdep_off();
+ err = vfs_write(file, ubuf, count, ppos);
+ lockdep_on();
+ if (err >= 0)
+ au_update_fuse_h_inode(file->f_vfsmnt, file->f_dentry);
+ /*ignore*/
+ return err;
+}
+
+ssize_t do_vfsub_write_k(struct file *file, void *kbuf, size_t count,
+ loff_t *ppos)
+{
+ ssize_t err;
+ mm_segment_t oldfs;
+
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+ err = do_vfsub_write_u(file, (const char __user *)kbuf, count, ppos);
+ set_fs(oldfs);
+ return err;
+}
+
+int do_vfsub_readdir(struct file *file, filldir_t filldir, void *arg)
+{
+ int err;
+
+ LKTRTrace("%.*s\n", AuDLNPair(file->f_dentry));
+
+ lockdep_off();
+ err = vfs_readdir(file, filldir, arg);
+ lockdep_on();
+ if (err >= 0)
+ au_update_fuse_h_inode(file->f_vfsmnt, file->f_dentry);
+ /*ignore*/
+ return err;
+}
+
+long do_vfsub_splice_to(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags)
+{
+ long err;
+
+ LKTRTrace("%.*s, pos %Ld, len %lu, 0x%x\n",
+ AuDLNPair(in->f_dentry), *ppos, (unsigned long)len, flags);
+
+ lockdep_off();
+ err = vfs_splice_to(in, ppos, pipe, len, flags);
+ lockdep_on();
+ if (err >= 0)
+ au_update_fuse_h_inode(in->f_vfsmnt, in->f_dentry); /*ignore*/
+ return err;
+}
+
+long do_vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags)
+{
+ long err;
+
+ LKTRTrace("%.*s, pos %Ld, len %lu, 0x%x\n",
+ AuDLNPair(out->f_dentry), *ppos, (unsigned long)len, flags);
+
+ lockdep_off();
+ err = vfs_splice_from(pipe, out, ppos, len, flags);
+ lockdep_on();
+ if (err >= 0)
+ au_update_fuse_h_inode(out->f_vfsmnt, out->f_dentry); /*ignore*/
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct au_vfsub_mkdir_args {
+ int *errp;
+ struct inode *dir;
+ struct dentry *dentry;
+ int mode;
+ int dlgt;
+};
+
+static void au_call_vfsub_mkdir(void *args)
+{
+ struct au_vfsub_mkdir_args *a = args;
+ *a->errp = vfsub_mkdir(a->dir, a->dentry, a->mode, a->dlgt);
+}
+
+int vfsub_sio_mkdir(struct inode *dir, struct dentry *dentry, int mode,
+ int dlgt)
+{
+ int err, do_sio, wkq_err;
+
+ LKTRTrace("i%lu, %.*s\n", dir->i_ino, AuDLNPair(dentry));
+
+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE, dlgt);
+ if (!do_sio)
+ err = vfsub_mkdir(dir, dentry, mode, dlgt);
+ else {
+ struct au_vfsub_mkdir_args args = {
+ .errp = &err,
+ .dir = dir,
+ .dentry = dentry,
+ .mode = mode,
+ .dlgt = dlgt
+ };
+ wkq_err = au_wkq_wait(au_call_vfsub_mkdir, &args, /*dlgt*/0);
+ if (unlikely(wkq_err))
+ err = wkq_err;
+ }
+
+ AuTraceErr(err);
+ return err;
+}
+
+struct au_vfsub_rmdir_args {
+ int *errp;
+ struct inode *dir;
+ struct dentry *dentry;
+ struct vfsub_args *vargs;
+};
+
+static void au_call_vfsub_rmdir(void *args)
+{
+ struct au_vfsub_rmdir_args *a = args;
+ *a->errp = vfsub_rmdir(a->dir, a->dentry, a->vargs);
+}
+
+int vfsub_sio_rmdir(struct inode *dir, struct dentry *dentry, int dlgt)
+{
+ int err, do_sio, wkq_err;
+ struct vfsub_args vargs;
+
+ LKTRTrace("i%lu, %.*s\n", dir->i_ino, AuDLNPair(dentry));
+
+ vfsub_args_init(&vargs, /*ign*/NULL, dlgt, /*force_unlink*/0);
+ do_sio = au_test_h_perm_sio(dir, MAY_EXEC | MAY_WRITE, dlgt);
+ if (!do_sio)
+ err = vfsub_rmdir(dir, dentry, &vargs);
+ else {
+ struct au_vfsub_rmdir_args args = {
+ .errp = &err,
+ .dir = dir,
+ .dentry = dentry,
+ .vargs = &vargs
+ };
+ wkq_err = au_wkq_wait(au_call_vfsub_rmdir, &args, /*dlgt*/0);
+ if (unlikely(wkq_err))
+ err = wkq_err;
+ }
+
+ AuTraceErr(err);
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct notify_change_args {
+ int *errp;
+ struct dentry *h_dentry;
+ struct iattr *ia;
+ struct vfsub_args *vargs;
+};
+
+static void call_notify_change(void *args)
+{
+ struct notify_change_args *a = args;
+ struct inode *h_inode;
+
+ LKTRTrace("%.*s, ia_valid 0x%x\n",
+ AuDLNPair(a->h_dentry), a->ia->ia_valid);
+ h_inode = a->h_dentry->d_inode;
+ IMustLock(h_inode);
+
+ *a->errp = -EPERM;
+ if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
+ vfsub_ignore(a->vargs);
+ lockdep_off();
+ *a->errp = notify_change(a->h_dentry, a->ia);
+ lockdep_on();
+ if (!*a->errp)
+ au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
+ else
+ vfsub_unignore(a->vargs);
+ }
+ AuTraceErr(*a->errp);
+}
+
+#ifdef CONFIG_AUFS_DLGT
+static void vfsub_notify_change_dlgt(struct notify_change_args *args,
+ unsigned int flags)
+{
+ if (!vfsub_ftest(flags, DLGT))
+ call_notify_change(args);
+ else {
+ int wkq_err;
+ wkq_err = au_wkq_wait(call_notify_change, args, /*dlgt*/1);
+ if (unlikely(wkq_err))
+ *args->errp = wkq_err;
+ }
+}
+#else
+static void vfsub_notify_change_dlgt(struct notify_change_args *args,
+ unsigned int flags)
+{
+ call_notify_change(args);
+}
+#endif
+
+int vfsub_notify_change(struct dentry *dentry, struct iattr *ia,
+ struct vfsub_args *vargs)
+{
+ int err;
+ struct notify_change_args args = {
+ .errp = &err,
+ .h_dentry = dentry,
+ .ia = ia,
+ .vargs = vargs
+ };
+
+ vfsub_notify_change_dlgt(&args, vargs->flags);
+
+ AuTraceErr(err);
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct unlink_args {
+ int *errp;
+ struct inode *dir;
+ struct dentry *dentry;
+ struct vfsub_args *vargs;
+};
+
+static void call_unlink(void *args)
+{
+ struct unlink_args *a = args;
+ struct inode *h_inode;
+ const int stop_sillyrename = (au_test_nfs(a->dentry->d_sb)
+ && atomic_read(&a->dentry->d_count) == 1);
+
+ LKTRTrace("%.*s, stop_silly %d, cnt %d\n",
+ AuDLNPair(a->dentry), stop_sillyrename,
+ atomic_read(&a->dentry->d_count));
+
+ if (!stop_sillyrename)
+ dget(a->dentry);
+ h_inode = a->dentry->d_inode;
+ if (h_inode)
+ atomic_inc_return(&h_inode->i_count);
+ *a->errp = do_vfsub_unlink(a->dir, a->dentry);
+ if (!stop_sillyrename)
+ dput(a->dentry);
+ if (h_inode)
+ iput(h_inode);
+
+ AuTraceErr(*a->errp);
+}
+
+/*
+ * @dir: must be locked.
+ * @dentry: target dentry.
+ */
+int vfsub_unlink(struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs)
+{
+ int err;
+ struct unlink_args args = {
+ .errp = &err,
+ .dir = dir,
+ .dentry = dentry,
+ .vargs = vargs
+ };
+
+ if (!vfsub_ftest(vargs->flags, DLGT)
+ && !vfsub_ftest(vargs->flags, FORCE_UNLINK))
+ call_unlink(&args);
+ else {
+ int wkq_err;
+ wkq_err = au_wkq_wait(call_unlink, &args,
+ vfsub_ftest(vargs->flags, DLGT));
+ if (unlikely(wkq_err))
+ err = wkq_err;
+ }
+
+ return err;
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct statfs_args {
+ int *errp;
+ void *arg;
+ struct kstatfs *buf;
+};
+
+static void call_statfs(void *args)
+{
+ struct statfs_args *a = args;
+ *a->errp = vfs_statfs(a->arg, a->buf);
+}
+
+#ifdef CONFIG_AUFS_DLGT
+static void vfsub_statfs_dlgt(struct statfs_args *args, int dlgt)
+{
+ if (!dlgt)
+ call_statfs(args);
+ else {
+ int wkq_err;
+ wkq_err = au_wkq_wait(call_statfs, args, /*dlgt*/1);
+ if (unlikely(wkq_err))
+ *args->errp = wkq_err;
+ }
+}
+#else
+static void vfsub_statfs_dlgt(struct statfs_args *args, int dlgt)
+{
+ call_statfs(args);
+}
+#endif
+
+int vfsub_statfs(void *arg, struct kstatfs *buf, int dlgt)
+{
+ int err;
+ struct statfs_args args = {
+ .errp = &err,
+ .arg = arg,
+ .buf = buf
+ };
+
+ vfsub_statfs_dlgt(&args, dlgt);
+
+ return err;
+}
diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h
new file mode 100644
index 0000000..d949833
--- /dev/null
+++ b/fs/aufs/vfsub.h
@@ -0,0 +1,472 @@
+/*
+ * Copyright (C) 2007-2008 Junjiro Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * sub-routines for VFS
+ */
+
+#ifndef __AUFS_VFSUB_H__
+#define __AUFS_VFSUB_H__
+
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
+#include <linux/namei.h>
+#include <linux/splice.h>
+#include <linux/inotify.h>
+
+/* ---------------------------------------------------------------------- */
+
+/* vfsub flags */
+#define Vfsub_DLGT 1 /* operation with delegation */
+#define Vfsub_FORCE_UNLINK (1 << 1) /* force unlinking */
+#define vfsub_ftest(flags, name) ((flags) & Vfsub_##name)
+#define vfsub_fset(flags, name) { (flags) |= Vfsub_##name; }
+#define vfsub_fclr(flags, name) { (flags) &= ~Vfsub_##name; }
+#ifndef CONFIG_AUFS_DLGT
+#undef Vfsub_DLGT
+#define Vfsub_DLGT 0
+#endif
+
+struct au_hin_ignore;
+struct vfsub_args {
+#ifdef CONFIG_AUFS_HINOTIFY
+ /* inotify events to be ignored */
+ int nignore;
+ struct au_hin_ignore *ignore;
+#endif
+
+ unsigned int flags;
+};
+
+struct au_hinode;
+#ifdef CONFIG_AUFS_HINOTIFY
+static inline
+void do_vfsub_args_reinit(struct vfsub_args *vargs, struct au_hin_ignore *ign)
+{
+ vargs->nignore = 0;
+ vargs->ignore = ign;
+}
+
+static inline void vfsub_args_reinit(struct vfsub_args *vargs)
+{
+ vargs->nignore = 0;
+}
+
+__u32 vfsub_events_notify_change(struct iattr *ia);
+void vfsub_ign_hinode(struct vfsub_args *vargs, __u32 events,
+ struct au_hinode *hinode);
+void vfsub_ign_inode(struct vfsub_args *vargs, __u32 events,
+ struct inode *inode, struct inode *h_inode);
+
+void vfsub_ignore(struct vfsub_args *vargs);
+void vfsub_unignore(struct vfsub_args *vargs);
+#else
+static inline
+void do_vfsub_args_reinit(struct vfsub_args *vargs, struct au_hin_ignore *ign)
+{
+ /* empty */
+}
+
+static inline void vfsub_args_reinit(struct vfsub_args *vargs)
+{
+ /* empty */
+}
+
+static inline __u32 vfsub_events_notify_change(struct iattr *ia)
+{
+ return 0;
+}
+
+static inline void vfsub_ign_hinode(struct vfsub_args *vargs, __u32 events,
+ struct au_hinode *hinode)
+{
+ /* empty */
+}
+
+static inline void vfsub_ign_inode(struct vfsub_args *vargs, __u32 events,
+ struct inode *inode, struct inode *h_inode)
+{
+ /* empty */
+}
+
+static inline void vfsub_ignore(struct vfsub_args *vargs)
+{
+ /* empty */
+}
+
+static inline void vfsub_unignore(struct vfsub_args *vargs)
+{
+ /* empty */
+}
+#endif /* CONFIG_AUFS_HINOTIFY */
+
+void vfsub_args_init(struct vfsub_args *vargs, struct au_hin_ignore *ign,
+ int dlgt, int force_unlink);
+
+/* ---------------------------------------------------------------------- */
+
+/* inotify_inode_watched() is not exported */
+static inline int au_test_inotify(struct inode *inode)
+{
+#ifdef CONFIG_INOTIFY
+ return !list_empty(&inode->inotify_watches);
+#endif
+ return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+
+/* lock subclass for hidden inode */
+/* default MAX_LOCKDEP_SUBCLASSES(8) is not enough */
+/* todo: reduce? */
+enum {
+ AuLsc_I_Begin = I_MUTEX_QUOTA, /* 4 */
+ AuLsc_I_PARENT, /* hidden inode, parent first */
+ AuLsc_I_CHILD,
+ AuLsc_I_PARENT2, /* copyup dirs */
+ AuLsc_I_CHILD2,
+ AuLsc_I_End
+};
+
+#define IMustLock(i) MtxMustLock(&(i)->i_mutex)
+
+static inline
+struct dentry *vfsub_lock_rename(struct dentry *d1, struct dentry *d2)
+{
+ struct dentry *d;
+
+ lockdep_off();
+ d = lock_rename(d1, d2);
+ lockdep_on();
+ return d;
+}
+
+static inline void vfsub_unlock_rename(struct dentry *d1, struct dentry *d2)
+{
+ lockdep_off();
+ unlock_rename(d1, d2);
+ lockdep_on();
+}
+
+/* ---------------------------------------------------------------------- */
+
+#ifdef CONFIG_AUFS_WORKAROUND_FUSE
+/* br_fuse.c */
+int au_update_fuse_h_inode(struct vfsmount *h_mnt, struct dentry *h_dentry);
+#else
+static inline
+int au_update_fuse_h_inode(struct vfsmount *h_mnt, struct dentry *h_dentry)
+{
+ return 0;
+}
+#endif
+
+#ifdef CONFIG_AUFS_BR_XFS
+/* br_xfs.c */
+dev_t au_h_rdev(struct inode *h_inode, struct vfsmount *h_mnt,
+ struct dentry *h_dentry);
+#else
+static inline
+dev_t au_h_rdev(struct inode *h_inode, struct vfsmount *h_mnt,
+ struct dentry *h_dentry)
+{
+ return h_inode->i_rdev;
+}
+#endif
+
+/* simple abstractions, for future use */
+static inline
+int do_vfsub_permission(struct inode *inode, int mask, struct nameidata *nd)
+{
+ LKTRTrace("i%lu, mask 0x%x, nd %d\n", inode->i_ino, mask, !!nd);
+ IMustLock(inode);
+ return permission(inode, mask, nd);
+}
+
+/* ---------------------------------------------------------------------- */
+
+struct file *vfsub_filp_open(const char *path, int oflags, int mode);
+int vfsub_path_lookup(const char *name, unsigned int flags,
+ struct nameidata *nd);
+struct dentry *vfsub_lookup_one_len(const char *name, struct dentry *parent,
+ int len);
+
+struct dentry *vfsub__lookup_hash(struct qstr *name, struct dentry *parent,
+ struct nameidata *nd);
+
+/* ---------------------------------------------------------------------- */
+
+int do_vfsub_create(struct inode *dir, struct dentry *dentry, int mode,
+ struct nameidata *nd);
+int do_vfsub_symlink(struct inode *dir, struct dentry *dentry,
+ const char *symname, int mode);
+int do_vfsub_mknod(struct inode *dir, struct dentry *dentry, int mode,
+ dev_t dev);
+int do_vfsub_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry);
+int do_vfsub_rename(struct inode *src_dir, struct dentry *src_dentry,
+ struct inode *dir, struct dentry *dentry);
+int do_vfsub_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+int do_vfsub_rmdir(struct inode *dir, struct dentry *dentry);
+int do_vfsub_unlink(struct inode *dir, struct dentry *dentry);
+
+/* ---------------------------------------------------------------------- */
+
+ssize_t do_vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
+ loff_t *ppos);
+/* todo: kernel_read()? */
+ssize_t do_vfsub_read_k(struct file *file, void *kbuf, size_t count,
+ loff_t *ppos);
+ssize_t do_vfsub_write_u(struct file *file, const char __user *ubuf,
+ size_t count, loff_t *ppos);
+ssize_t do_vfsub_write_k(struct file *file, void *kbuf, size_t count,
+ loff_t *ppos);
+int do_vfsub_readdir(struct file *file, filldir_t filldir, void *arg);
+
+/* ---------------------------------------------------------------------- */
+
+long do_vfsub_splice_to(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags);
+long do_vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags);
+
+/* ---------------------------------------------------------------------- */
+
+static inline loff_t vfsub_llseek(struct file *file, loff_t offset, int origin)
+{
+ loff_t err;
+
+ LKTRTrace("%.*s\n", AuDLNPair(file->f_dentry));
+
+ lockdep_off();
+ err = vfs_llseek(file, offset, origin);
+ lockdep_on();
+ return err;
+}
+
+static inline int do_vfsub_getattr(struct vfsmount *mnt, struct dentry *dentry,
+ struct kstat *st)
+{
+ LKTRTrace("%.*s\n", AuDLNPair(dentry));
+ return vfs_getattr(mnt, dentry, st);
+}
+
+/* ---------------------------------------------------------------------- */
+
+#if defined(CONFIG_AUFS_HINOTIFY) || defined(CONFIG_AUFS_DLGT)
+/* hin_or_dlgt.c */
+int vfsub_permission(struct inode *inode, int mask, struct nameidata *nd,
+ int dlgt);
+
+int vfsub_create(struct inode *dir, struct dentry *dentry, int mode,
+ struct nameidata *nd, int dlgt);
+int vfsub_symlink(struct inode *dir, struct dentry *dentry, const char *symname,
+ int mode, int dlgt);
+int vfsub_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev,
+ int dlgt);
+int vfsub_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry, int dlgt);
+int vfsub_rename(struct inode *src_dir, struct dentry *src_dentry,
+ struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs);
+int vfsub_mkdir(struct inode *dir, struct dentry *dentry, int mode, int dlgt);
+int vfsub_rmdir(struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs);
+
+ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
+ loff_t *ppos, int dlgt);
+ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count, loff_t *ppos,
+ int dlgt);
+ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count,
+ loff_t *ppos, struct vfsub_args *vargs);
+ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos,
+ struct vfsub_args *vargs);
+int vfsub_readdir(struct file *file, filldir_t filldir, void *arg, int dlgt);
+long vfsub_splice_to(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags, int dlgt);
+long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags,
+ struct vfsub_args *vargs);
+
+int vfsub_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *st,
+ int dlgt);
+#else
+
+static inline
+int vfsub_permission(struct inode *inode, int mask, struct nameidata *nd,
+ int dlgt)
+{
+ return do_vfsub_permission(inode, mask, nd);
+}
+
+static inline
+int vfsub_create(struct inode *dir, struct dentry *dentry, int mode,
+ struct nameidata *nd, int dlgt)
+{
+ return do_vfsub_create(dir, dentry, mode, nd);
+}
+
+static inline
+int vfsub_symlink(struct inode *dir, struct dentry *dentry, const char *symname,
+ int mode, int dlgt)
+{
+ return do_vfsub_symlink(dir, dentry, symname, mode);
+}
+
+static inline
+int vfsub_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev,
+ int dlgt)
+{
+ return do_vfsub_mknod(dir, dentry, mode, dev);
+}
+
+static inline
+int vfsub_link(struct dentry *src_dentry, struct inode *dir,
+ struct dentry *dentry, int dlgt)
+{
+ return do_vfsub_link(src_dentry, dir, dentry);
+}
+
+static inline
+int vfsub_rename(struct inode *src_dir, struct dentry *src_dentry,
+ struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs)
+{
+ int err;
+
+ vfsub_ignore(vargs);
+ err = do_vfsub_rename(src_dir, src_dentry, dir, dentry);
+ if (unlikely(err))
+ vfsub_unignore(vargs);
+ return err;
+}
+
+static inline
+int vfsub_mkdir(struct inode *dir, struct dentry *dentry, int mode, int dlgt)
+{
+ return do_vfsub_mkdir(dir, dentry, mode);
+}
+
+static inline
+int vfsub_rmdir(struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs)
+{
+ int err;
+
+ vfsub_ignore(vargs);
+ err = do_vfsub_rmdir(dir, dentry);
+ if (unlikely(err))
+ vfsub_unignore(vargs);
+ return err;
+}
+
+static inline
+ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
+ loff_t *ppos, int dlgt)
+{
+ return do_vfsub_read_u(file, ubuf, count, ppos);
+}
+
+static inline
+ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count, loff_t *ppos,
+ int dlgt)
+{
+ return do_vfsub_read_k(file, kbuf, count, ppos);
+}
+
+static inline
+ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count,
+ loff_t *ppos, struct vfsub_args *vargs)
+{
+ int err;
+
+ vfsub_ignore(vargs);
+ err = do_vfsub_write_u(file, ubuf, count, ppos);
+ if (unlikely(err < 0))
+ vfsub_unignore(vargs);
+ return err;
+}
+
+static inline
+ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos,
+ struct vfsub_args *vargs)
+{
+ int err;
+
+ vfsub_ignore(vargs);
+ err = do_vfsub_write_k(file, kbuf, count, ppos);
+ if (unlikely(err < 0))
+ vfsub_unignore(vargs);
+ return err;
+}
+
+static inline
+int vfsub_readdir(struct file *file, filldir_t filldir, void *arg, int dlgt)
+{
+ return do_vfsub_readdir(file, filldir, arg);
+}
+
+static inline
+long vfsub_splice_to(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags, int dlgt)
+{
+ return do_vfsub_splice_to(in, ppos, pipe, len, flags);
+}
+
+static inline
+long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags,
+ struct vfsub_args *vargs)
+{
+ long err;
+
+ vfsub_ignore(vargs);
+ err = do_vfsub_splice_from(pipe, out, ppos, len, flags);
+ if (unlikely(err < 0))
+ vfsub_unignore(vargs);
+ return err;
+}
+
+static inline
+int vfsub_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *st,
+ int dlgt)
+{
+ return do_vfsub_getattr(mnt, dentry, st);
+}
+#endif /* CONFIG_AUFS_DLGT || CONFIG_AUFS_HINOTIFY */
+
+/* ---------------------------------------------------------------------- */
+
+int vfsub_sio_mkdir(struct inode *dir, struct dentry *dentry, int mode,
+ int dlgt);
+int vfsub_sio_rmdir(struct inode *dir, struct dentry *dentry, int dlgt);
+
+/* ---------------------------------------------------------------------- */
+
+int vfsub_notify_change(struct dentry *dentry, struct iattr *ia,
+ struct vfsub_args *vargs);
+int vfsub_unlink(struct inode *dir, struct dentry *dentry,
+ struct vfsub_args *vargs);
+int vfsub_statfs(void *arg, struct kstatfs *buf, int dlgt);
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_VFSUB_H__ */
--
1.5.5.1.308.g1fbb5.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists