Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb668734 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

VFS: assorted d_backing_inode() annotations 



Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent df2b1afd

arch/x86/kvm/assigned-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mtd/ubi/build.c

+3 −3
Original line number Diff line number Diff line
@@ -1164,9 +1164,9 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev) 
		return ERR_PTR(err);



	/* MTD device number is defined by the major / minor numbers */

	major = imajor(path.dentry->d_inode);

	minor = iminor(path.dentry->d_inode);

	mode = path.dentry->d_inode->i_mode;

	major = imajor(d_backing_inode(path.dentry));

	minor = iminor(d_backing_inode(path.dentry));

	mode = d_backing_inode(path.dentry)->i_mode;

	path_put(&path);

	if (major != MTD_CHAR_MAJOR || !S_ISCHR(mode))

		return ERR_PTR(-EINVAL);

drivers/mtd/ubi/kapi.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode) 
	if (error)

		return ERR_PTR(error);



	inode = path.dentry->d_inode;

	inode = d_backing_inode(path.dentry);

	mod = inode->i_mode;

	ubi_num = ubi_major2num(imajor(inode));

	vol_id = iminor(inode) - 1;

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1716,7 +1716,7 @@ struct block_device *lookup_bdev(const char *pathname) 
	if (error)

		return ERR_PTR(error);



	inode = path.dentry->d_inode;

	inode = d_backing_inode(path.dentry);

	error = -ENOTBLK;

	if (!S_ISBLK(inode->i_mode))

		goto fail;

fs/posix_acl.c

+4 −4
Original line number Diff line number Diff line
@@ -774,12 +774,12 @@ posix_acl_xattr_get(struct dentry *dentry, const char *name, 
	struct posix_acl *acl;

	int error;



	if (!IS_POSIXACL(dentry->d_inode))

	if (!IS_POSIXACL(d_backing_inode(dentry)))

		return -EOPNOTSUPP;

	if (d_is_symlink(dentry))

		return -EOPNOTSUPP;



	acl = get_acl(dentry->d_inode, type);

	acl = get_acl(d_backing_inode(dentry), type);

	if (IS_ERR(acl))

		return PTR_ERR(acl);

	if (acl == NULL)
@@ -795,7 +795,7 @@ static int 
posix_acl_xattr_set(struct dentry *dentry, const char *name,

		const void *value, size_t size, int flags, int type)

{

	struct inode *inode = dentry->d_inode;

	struct inode *inode = d_backing_inode(dentry);

	struct posix_acl *acl = NULL;

	int ret;
@@ -834,7 +834,7 @@ posix_acl_xattr_list(struct dentry *dentry, char *list, size_t list_size, 
	const char *xname;

	size_t size;



	if (!IS_POSIXACL(dentry->d_inode))

	if (!IS_POSIXACL(d_backing_inode(dentry)))

		return -EOPNOTSUPP;

	if (d_is_symlink(dentry))

		return -EOPNOTSUPP;