Convert ceph i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t.
Also correct signed format specifiers to unsigned, since inode numbers are unsigned values.
Signed-off-by: Jeff Layton jlayton@kernel.org --- fs/ceph/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c index f3de43ccb470ddbd7945426d79f9024ae615c127..718c194ba5d8ce22c6a5d1dd687ec3761263e7e1 100644 --- a/fs/ceph/crypto.c +++ b/fs/ceph/crypto.c @@ -272,7 +272,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, char *buf, int elen) /* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */ WARN_ON(elen > 240); if (dir != parent) // leading _ is already there; append _<inum> - elen += 1 + sprintf(p + elen, "_%ld", dir->i_ino); + elen += 1 + sprintf(p + elen, "_%" PRIino "u", dir->i_ino);
out: kfree(cryptbuf); @@ -377,7 +377,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname, if (!ret && (dir != fname->dir)) { char tmp_buf[BASE64_CHARS(NAME_MAX)];
- name_len = snprintf(tmp_buf, sizeof(tmp_buf), "_%.*s_%ld", + name_len = snprintf(tmp_buf, sizeof(tmp_buf), "_%.*s_%" PRIino "u", oname->len, oname->name, dir->i_ino); memcpy(oname->name, tmp_buf, name_len); oname->len = name_len;