VFS: assorted d_backing_inode() annotations

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/x86/kvm/assigned-dev.c b/arch/x86/kvm/assigned-dev.c
index 6eb5c20ee3739855a5d3fe52aa9a253b677552fd..d090ecf088097f4f845fc20d7d1bdd0a5849e712 100644 (file)
--- a/arch/x86/kvm/assigned-dev.c
+++ b/arch/x86/kvm/assigned-dev.c
@@ -666,7 +666,7 @@ static int probe_sysfs_permissions(struct pci_dev *dev)
                if (r)
                        return r;
 
-               inode = path.dentry->d_inode;
+               inode = d_backing_inode(path.dentry);
 
                r = inode_permission(inode, MAY_READ | MAY_WRITE | MAY_ACCESS);
                path_put(&path);

diff --cc drivers/mtd/ubi/build.c
Simple merge

diff --cc drivers/mtd/ubi/kapi.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/posix_acl.c
Simple merge

diff --cc fs/stat.c
Simple merge