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: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 2e4764fd187271856086274fe6234389e04172a2..d0cd0aba584328945feba4c428a8e3d54629e1b1 100644 (file)
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1186,7 +1186,7 @@ void __ceph_dentry_dir_lease_touch(struct ceph_dentry_info *di)
        struct dentry *dn = di->dentry;
        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);
 
        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);
        }
 
-       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);
 
        /* always trust cached snapped dentries, snapdir dentry */

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index cb18ee637cb7b66ee37221ceb9e521c852eec4b1..98a9a3101cdab49a23ef592519ef41244c02178d 100644 (file)
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -655,7 +655,7 @@ static int __build_xattrs(struct inode *inode)
        u32 len;
        const char *name, *val;
        struct ceph_inode_info *ci = ceph_inode(inode);
-       int xattr_version;
+       u64 xattr_version;
        struct ceph_inode_xattr **xattrs = NULL;
        int err = 0;
        int i;