Commit 0eb30853 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: print dentry offset in hex and fix xattr_version type 



In the debug logs about the di->offset or ctx->pos it is in hex
format, but some others are using the dec format. It is a little
hard to read.

For the xattr version, it is u64 type, using a shorter type may
truncate it.

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 9f8b72b3

fs/ceph/dir.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1186,7 +1186,7 @@ void __ceph_dentry_dir_lease_touch(struct ceph_dentry_info *di) 
	struct dentry *dn = di->dentry;

	struct dentry *dn = di->dentry;

	struct ceph_mds_client *mdsc;

	struct ceph_mds_client *mdsc;





	dout("dentry_dir_lease_touch %p %p '%pd' (offset %lld)\n",

	dout("dentry_dir_lease_touch %p %p '%pd' (offset 0x%llx)\n",

	     di, dn, dn, di->offset);

	     di, dn, dn, di->offset);





	if (!list_empty(&di->lease_list)) {

	if (!list_empty(&di->lease_list)) {
@@ -1567,7 +1567,7 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags) 
		inode = d_inode(dentry);

		inode = d_inode(dentry);

	}

	}





	dout("d_revalidate %p '%pd' inode %p offset %lld\n", dentry,

	dout("d_revalidate %p '%pd' inode %p offset 0x%llx\n", dentry,

	     dentry, inode, ceph_dentry(dentry)->offset);

	     dentry, inode, ceph_dentry(dentry)->offset);





	/* always trust cached snapped dentries, snapdir dentry */

	/* always trust cached snapped dentries, snapdir dentry */

fs/ceph/xattr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -655,7 +655,7 @@ static int __build_xattrs(struct inode *inode) 
	u32 len;

	u32 len;

	const char *name, *val;

	const char *name, *val;

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_inode_info *ci = ceph_inode(inode);

	int xattr_version;

	u64 xattr_version;

	struct ceph_inode_xattr **xattrs = NULL;

	struct ceph_inode_xattr **xattrs = NULL;

	int err = 0;

	int err = 0;

	int i;

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE