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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
  direct I/O fallback sync simplification
  ocfs: stop using do_sync_mapping_range
  cleanup blockdev_direct_IO locking
  make generic_acl slightly more generic
  sanitize xattr handler prototypes
  libfs: move EXPORT_SYMBOL for d_alloc_name
  vfs: force reval of target when following LAST_BIND symlinks (try #7)
  ima: limit imbalance msg
  Untangling ima mess, part 3: kill dead code in ima
  Untangling ima mess, part 2: deal with counters
  Untangling ima mess, part 1: alloc_file()
  O_TRUNC open shouldn't fail after file truncation
  ima: call ima_inode_free ima_inode_free
  IMA: clean up the IMA counts updating code
  ima: only insert at inode creation time
  ima: valid return code from ima_inode_alloc
  fs: move get_empty_filp() deffinition to internal.h
  Sanitize exec_permission_lite()
  Kill cached_lookup() and real_lookup()
  Kill path_lookup_open()
  ...

Trivial conflicts in fs/direct-io.c

1 files changed, 8 insertions, 7 deletions

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 599b233bef75..5246285a95fb 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2200,7 +2200,7 @@ pfm_alloc_file(pfm_context_t *ctx)
 {
         struct file *file;
         struct inode *inode;
-        struct dentry *dentry;
+        struct path path;
         char name[32];
         struct qstr this;
 
@@ -2225,18 +2225,19 @@ pfm_alloc_file(pfm_context_t *ctx)
         /*
          * allocate a new dcache entry
          */
-        dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
-        if (!dentry) {
+        path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
+        if (!path.dentry) {
                 iput(inode);
                 return ERR_PTR(-ENOMEM);
         }
+        path.mnt = mntget(pfmfs_mnt);
 
-        dentry->d_op = &pfmfs_dentry_operations;
-        d_add(dentry, inode);
+        path.dentry->d_op = &pfmfs_dentry_operations;
+        d_add(path.dentry, inode);
 
-        file = alloc_file(pfmfs_mnt, dentry, FMODE_READ, &pfm_file_ops);
+        file = alloc_file(&path, FMODE_READ, &pfm_file_ops);
         if (!file) {
-                dput(dentry);
+                path_put(&path);
                 return ERR_PTR(-ENFILE);
         }