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

Commit b296821a authored by Al Viro's avatar Al Viro
Browse files

xattr_handler: pass dentry and inode as separate arguments of ->get() 



... and do not assume they are already attached to each other

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

fs/9p/acl.c

+3 −3
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep, 
}



static int v9fs_xattr_get_acl(const struct xattr_handler *handler,

			      struct dentry *dentry, const char *name,

			      void *buffer, size_t size)

			      struct dentry *dentry, struct inode *inode,

			      const char *name, void *buffer, size_t size)

{

	struct v9fs_session_info *v9ses;

	struct posix_acl *acl;
@@ -227,7 +227,7 @@ static int v9fs_xattr_get_acl(const struct xattr_handler *handler, 
	if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)

		return v9fs_xattr_get(dentry, handler->name, buffer, size);



	acl = v9fs_get_cached_acl(d_inode(dentry), handler->flags);

	acl = v9fs_get_cached_acl(inode, handler->flags);

	if (IS_ERR(acl))

		return PTR_ERR(acl);

	if (acl == NULL)

fs/9p/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) 
}



static int v9fs_xattr_handler_get(const struct xattr_handler *handler,

				  struct dentry *dentry, const char *name,

				  void *buffer, size_t size)

				  struct dentry *dentry, struct inode *inode,

				  const char *name, void *buffer, size_t size)

{

	const char *full_name = xattr_full_name(handler, name);

fs/btrfs/xattr.c

+2 −4
Original line number Diff line number Diff line
@@ -369,11 +369,9 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
}



static int btrfs_xattr_handler_get(const struct xattr_handler *handler,

				   struct dentry *dentry, const char *name,

				   void *buffer, size_t size)

				   struct dentry *unused, struct inode *inode,

				   const char *name, void *buffer, size_t size)

{

	struct inode *inode = d_inode(dentry);



	name = xattr_full_name(handler, name);

	return __btrfs_getxattr(inode, name, buffer, size);

}

fs/ext2/xattr_security.c

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


static int

ext2_xattr_security_get(const struct xattr_handler *handler,

			struct dentry *dentry, const char *name,

			void *buffer, size_t size)

			struct dentry *unused, struct inode *inode,

			const char *name, void *buffer, size_t size)

{

	return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_SECURITY, name,

	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_SECURITY, name,

			      buffer, size);

}

fs/ext2/xattr_trusted.c

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ ext2_xattr_trusted_list(struct dentry *dentry) 


static int

ext2_xattr_trusted_get(const struct xattr_handler *handler,

		       struct dentry *dentry, const char *name,

		       void *buffer, size_t size)

		       struct dentry *unused, struct inode *inode,

		       const char *name, void *buffer, size_t size)

{

	return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_TRUSTED, name,

	return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name,

			      buffer, size);

}