Merge branch 'linus_origin' into hotfixes

diff --combined fs/compat.c
index 439292a,43ca016..2ce4456
--- 1/fs/compat.c
--- 2/fs/compat.c
+++ b/fs/compat.c
@@@ -241,10 -241,10 +241,10 @@@ asmlinkage long compat_sys_statfs(cons
        error = user_path_walk(path, &nd);
        if (!error) {
                struct kstatfs tmp;
-               error = vfs_statfs(nd.dentry, &tmp);
+               error = vfs_statfs(nd.path.dentry, &tmp);
                if (!error)
                        error = put_compat_statfs(buf, &tmp);
-               path_release(&nd);
+               path_put(&nd.path);
        }
        return error;
  }
@@@ -309,10 -309,10 +309,10 @@@ asmlinkage long compat_sys_statfs64(con
        error = user_path_walk(path, &nd);
        if (!error) {
                struct kstatfs tmp;
-               error = vfs_statfs(nd.dentry, &tmp);
+               error = vfs_statfs(nd.path.dentry, &tmp);
                if (!error)
                        error = put_compat_statfs64(buf, &tmp);
-               path_release(&nd);
+               path_put(&nd.path);
        }
        return error;
  }
@@@ -702,6 -702,9 +702,6 @@@ static int do_nfs4_super_data_conv(voi
                real->flags = raw->flags;
                real->version = raw->version;
        }
 -      else {
 -              return -EINVAL;
 -      }
  
        return 0;
  }