Skip to content

L
linux-davinci-2.6.23
Commit 16c32b71 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Convert unnecessary XDR warning messages into dprintk() 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4f9838c7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
fs/nfs/nfs4xdr.c
View file @ 16c32b71
...@@ -2766,8 +2766,7 @@ static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_re ...@@ -2766,8 +2766,7 @@ static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_re
goto xdr_error; goto xdr_error;
status = verify_attr_len(xdr, savep, attrlen); status = verify_attr_len(xdr, savep, attrlen);
xdr_error: xdr_error:
if (status != 0) dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status);
printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status);
return status; return status;
} }
...@@ -2800,8 +2799,7 @@ static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) ...@@ -2800,8 +2799,7 @@ static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat)
status = verify_attr_len(xdr, savep, attrlen); status = verify_attr_len(xdr, savep, attrlen);
xdr_error: xdr_error:
if (status != 0) dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status);
printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status);
return status; return status;
} }
...@@ -2826,8 +2824,7 @@ static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf ...@@ -2826,8 +2824,7 @@ static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf
status = verify_attr_len(xdr, savep, attrlen); status = verify_attr_len(xdr, savep, attrlen);
xdr_error: xdr_error:
if (status != 0) dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status);
printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status);
return status; return status;
} }
...@@ -2886,8 +2883,7 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons ...@@ -2886,8 +2883,7 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons
if ((status = verify_attr_len(xdr, savep, attrlen)) == 0) if ((status = verify_attr_len(xdr, savep, attrlen)) == 0)
fattr->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4; fattr->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4;
xdr_error: xdr_error:
if (status != 0) dprintk("%s: xdr returned %d\n", __FUNCTION__, -status);
printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status);
return status; return status;
} }
...@@ -2920,8 +2916,7 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) ...@@ -2920,8 +2916,7 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo)
status = verify_attr_len(xdr, savep, attrlen); status = verify_attr_len(xdr, savep, attrlen);
xdr_error: xdr_error:
if (status != 0) dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status);
printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status);
return status; return status;
} }
...@@ -3088,7 +3083,7 @@ static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) ...@@ -3088,7 +3083,7 @@ static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res)
p += bmlen; p += bmlen;
return decode_delegation(xdr, res); return decode_delegation(xdr, res);
xdr_error: xdr_error:
printk(KERN_NOTICE "%s: xdr error!\n", __FUNCTION__); dprintk("%s: Bitmap too large! Length = %u\n", __FUNCTION__, bmlen);
return -EIO; return -EIO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment