mirror of https://gitee.com/openkylin/linux.git
[GFS2] printk warning fixes
alpha: fs/gfs2/dir.c: In function 'gfs2_dir_read_leaf': fs/gfs2/dir.c:1322: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'sector_t' fs/gfs2/dir.c: In function 'gfs2_dir_read': fs/gfs2/dir.c:1455: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type '__u64' Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
parent
bf126aee6d
commit
f391a4ead6
|
@ -1319,9 +1319,11 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque,
|
||||||
if (IS_ERR(dent))
|
if (IS_ERR(dent))
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
if (entries2 != g.offset) {
|
if (entries2 != g.offset) {
|
||||||
fs_warn(sdp, "Number of entries corrupt in dir leaf %llu, "
|
fs_warn(sdp, "Number of entries corrupt in dir "
|
||||||
"entries2 (%u) != g.offset (%u)\n",
|
"leaf %llu, entries2 (%u) != "
|
||||||
(u64)bh->b_blocknr, entries2, g.offset);
|
"g.offset (%u)\n",
|
||||||
|
(unsigned long long)bh->b_blocknr,
|
||||||
|
entries2, g.offset);
|
||||||
|
|
||||||
error = -EIO;
|
error = -EIO;
|
||||||
goto out_kfree;
|
goto out_kfree;
|
||||||
|
@ -1454,7 +1456,8 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque,
|
||||||
if (dip->i_di.di_entries != g.offset) {
|
if (dip->i_di.di_entries != g.offset) {
|
||||||
fs_warn(sdp, "Number of entries corrupt in dir %llu, "
|
fs_warn(sdp, "Number of entries corrupt in dir %llu, "
|
||||||
"ip->i_di.di_entries (%u) != g.offset (%u)\n",
|
"ip->i_di.di_entries (%u) != g.offset (%u)\n",
|
||||||
dip->i_num.no_addr, dip->i_di.di_entries,
|
(unsigned long long)dip->i_num.no_addr,
|
||||||
|
dip->i_di.di_entries,
|
||||||
g.offset);
|
g.offset);
|
||||||
error = -EIO;
|
error = -EIO;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in New Issue