Commit e09580b3 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: don't list vxattrs in listxattr() 



Most filesystems that provide virtual xattrs (e.g. CIFS) don't display
them via listxattr(). Ceph does, and that causes some of the tests in
xfstests to fail.

Have cephfs stop listing vxattrs in listxattr. Userspace can always
query them directly when the name is known.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarDavid Disseldorp <ddiss@suse.de>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent e1e44602

fs/ceph/xattr.c

+0 −29
Original line number Diff line number Diff line
@@ -903,11 +903,9 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size) 
{

	struct inode *inode = d_inode(dentry);

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_vxattr *vxattrs = ceph_inode_vxattrs(inode);

	bool len_only = (size == 0);

	u32 namelen;

	int err;

	int i;



	spin_lock(&ci->i_ceph_lock);

	dout("listxattr %p ver=%lld index_ver=%lld\n", inode,
@@ -936,33 +934,6 @@ ssize_t ceph_listxattr(struct dentry *dentry, char *names, size_t size) 
		names = __copy_xattr_names(ci, names);

		size -= namelen;

	}





	/* virtual xattr names, too */

	if (vxattrs) {

		for (i = 0; vxattrs[i].name; i++) {

			size_t this_len;



			if (vxattrs[i].flags & VXATTR_FLAG_HIDDEN)

				continue;

			if (vxattrs[i].exists_cb && !vxattrs[i].exists_cb(ci))

				continue;



			this_len = strlen(vxattrs[i].name) + 1;

			namelen += this_len;

			if (len_only)

				continue;



			if (this_len > size) {

				err = -ERANGE;

				goto out;

			}



			memcpy(names, vxattrs[i].name, this_len);

			names += this_len;

			size -= this_len;

		}

	}

	err = namelen;

out:

	spin_unlock(&ci->i_ceph_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE