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

Commit 3dadecce authored by Al Viro's avatar Al Viro
Browse files

switch vfs_getattr() to struct path 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e72837e3

drivers/base/devtmpfs.c

+2 −1
Original line number Diff line number Diff line
@@ -302,7 +302,8 @@ static int handle_remove(const char *nodename, struct device *dev) 


	if (dentry->d_inode) {

		struct kstat stat;

		err = vfs_getattr(parent.mnt, dentry, &stat);

		struct path p = {.mnt = parent.mnt, .dentry = dentry};

		err = vfs_getattr(&p, &stat);

		if (!err && dev_mynode(dev, dentry->d_inode, &stat)) {

			struct iattr newattrs;

			/*

drivers/base/firmware_class.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ MODULE_PARM_DESC(path, "customized firmware image search path with a higher prio 
static noinline_for_stack long fw_file_size(struct file *file)

{

	struct kstat st;

	if (vfs_getattr(file->f_path.mnt, file->f_path.dentry, &st))

	if (vfs_getattr(&file->f_path, &st))

		return -1;

	if (!S_ISREG(st.mode))

		return -1;

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info) 


	if (lo->lo_state != Lo_bound)

		return -ENXIO;

	error = vfs_getattr(file->f_path.mnt, file->f_path.dentry, &stat);

	error = vfs_getattr(&file->f_path, &stat);

	if (error)

		return error;

	memset(info, 0, sizeof(*info));

fs/ecryptfs/ecryptfs_kernel.h

+6 −0
Original line number Diff line number Diff line
@@ -509,6 +509,12 @@ ecryptfs_dentry_to_lower_mnt(struct dentry *dentry) 
	return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt;

}



static inline struct path *

ecryptfs_dentry_to_lower_path(struct dentry *dentry)

{

	return &((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path;

}



static inline void

ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt)

{

fs/ecryptfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -1027,8 +1027,7 @@ int ecryptfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
	struct kstat lower_stat;

	int rc;



	rc = vfs_getattr(ecryptfs_dentry_to_lower_mnt(dentry),

			 ecryptfs_dentry_to_lower(dentry), &lower_stat);

	rc = vfs_getattr(ecryptfs_dentry_to_lower_path(dentry), &lower_stat);

	if (!rc) {

		fsstack_copy_attr_all(dentry->d_inode,

				      ecryptfs_inode_to_lower(dentry->d_inode));