Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile (part one) from Al Viro:
 "Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
  locking violations, etc.

  The most visible changes here are death of FS_REVAL_DOT (replaced with
  "has ->d_weak_revalidate()") and a new helper getting from struct file
  to inode.  Some bits of preparation to xattr method interface changes.

  Misc patches by various people sent this cycle *and* ocfs2 fixes from
  several cycles ago that should've been upstream right then.

  PS: the next vfs pile will be xattr stuff."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
  saner proc_get_inode() calling conventions
  proc: avoid extra pde_put() in proc_fill_super()
  fs: change return values from -EACCES to -EPERM
  fs/exec.c: make bprm_mm_init() static
  ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
  ocfs2: fix possible use-after-free with AIO
  ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
  get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
  target: writev() on single-element vector is pointless
  export kernel_write(), convert open-coded instances
  fs: encode_fh: return FILEID_INVALID if invalid fid_type
  kill f_vfsmnt
  vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
  nfsd: handle vfs_getattr errors in acl protocol
  switch vfs_getattr() to struct path
  default SET_PERSONALITY() in linux/elf.h
  ceph: prepopulate inodes only when request is aborted
  d_hash_and_lookup(): export, switch open-coded instances
  9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
  9p: split dropping the acls from v9fs_set_create_acl()
  ...

1 files changed, 11 insertions, 55 deletions

diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index 459b9ac45cf5..ec0abb6df3c3 100644
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -24,47 +24,6 @@
 MODULE_DESCRIPTION("Xen filesystem");
 MODULE_LICENSE("GPL");
 
-static struct inode *xenfs_make_inode(struct super_block *sb, int mode)
-{
-        struct inode *ret = new_inode(sb);
-
-        if (ret) {
-                ret->i_mode = mode;
-                ret->i_uid = GLOBAL_ROOT_UID;
-                ret->i_gid = GLOBAL_ROOT_GID;
-                ret->i_blocks = 0;
-                ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
-        }
-        return ret;
-}
-
-static struct dentry *xenfs_create_file(struct super_block *sb,
-                                        struct dentry *parent,
-                                        const char *name,
-                                        const struct file_operations *fops,
-                                        void *data,
-                                        int mode)
-{
-        struct dentry *dentry;
-        struct inode *inode;
-
-        dentry = d_alloc_name(parent, name);
-        if (!dentry)
-                return NULL;
-
-        inode = xenfs_make_inode(sb, S_IFREG | mode);
-        if (!inode) {
-                dput(dentry);
-                return NULL;
-        }
-
-        inode->i_fop = fops;
-        inode->i_private = data;
-
-        d_add(dentry, inode);
-        return dentry;
-}
-
 static ssize_t capabilities_read(struct file *file, char __user *buf,
                                  size_t size, loff_t *off)
 {
@@ -84,26 +43,23 @@ static const struct file_operations capabilities_file_ops = {
 static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
 {
         static struct tree_descr xenfs_files[] = {
-                [1] = {},
-                { "xenbus", &xen_xenbus_fops, S_IRUSR|S_IWUSR },
+                [2] = { "xenbus", &xen_xenbus_fops, S_IRUSR|S_IWUSR },
                 { "capabilities", &capabilities_file_ops, S_IRUGO },
                 { "privcmd", &xen_privcmd_fops, S_IRUSR|S_IWUSR },
                 {""},
         };
-        int rc;
 
-        rc = simple_fill_super(sb, XENFS_SUPER_MAGIC, xenfs_files);
-        if (rc < 0)
-                return rc;
-
-        if (xen_initial_domain()) {
-                xenfs_create_file(sb, sb->s_root, "xsd_kva",
-                                  &xsd_kva_file_ops, NULL, S_IRUSR|S_IWUSR);
-                xenfs_create_file(sb, sb->s_root, "xsd_port",
-                                  &xsd_port_file_ops, NULL, S_IRUSR|S_IWUSR);
-        }
+        static struct tree_descr xenfs_init_files[] = {
+                [2] = { "xenbus", &xen_xenbus_fops, S_IRUSR|S_IWUSR },
+                { "capabilities", &capabilities_file_ops, S_IRUGO },
+                { "privcmd", &xen_privcmd_fops, S_IRUSR|S_IWUSR },
+                { "xsd_kva", &xsd_kva_file_ops, S_IRUSR|S_IWUSR},
+                { "xsd_port", &xsd_port_file_ops, S_IRUSR|S_IWUSR},
+                {""},
+        };
 
-        return rc;
+        return simple_fill_super(sb, XENFS_SUPER_MAGIC,
+                        xen_initial_domain() ? xenfs_init_files : xenfs_files);
 }
 
 static struct dentry *xenfs_mount(struct file_system_type *fs_type,