diff options
-rw-r--r-- | fs/nfs/nfs4xdr.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 6f1bf182e0e0..fbbace8a30c4 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -2766,8 +2766,7 @@ static int decode_server_caps(struct xdr_stream *xdr, struct nfs4_server_caps_re | |||
2766 | goto xdr_error; | 2766 | goto xdr_error; |
2767 | status = verify_attr_len(xdr, savep, attrlen); | 2767 | status = verify_attr_len(xdr, savep, attrlen); |
2768 | xdr_error: | 2768 | xdr_error: |
2769 | if (status != 0) | 2769 | dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status); |
2770 | printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status); | ||
2771 | return status; | 2770 | return status; |
2772 | } | 2771 | } |
2773 | 2772 | ||
@@ -2800,8 +2799,7 @@ static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) | |||
2800 | 2799 | ||
2801 | status = verify_attr_len(xdr, savep, attrlen); | 2800 | status = verify_attr_len(xdr, savep, attrlen); |
2802 | xdr_error: | 2801 | xdr_error: |
2803 | if (status != 0) | 2802 | dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status); |
2804 | printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status); | ||
2805 | return status; | 2803 | return status; |
2806 | } | 2804 | } |
2807 | 2805 | ||
@@ -2826,8 +2824,7 @@ static int decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf | |||
2826 | 2824 | ||
2827 | status = verify_attr_len(xdr, savep, attrlen); | 2825 | status = verify_attr_len(xdr, savep, attrlen); |
2828 | xdr_error: | 2826 | xdr_error: |
2829 | if (status != 0) | 2827 | dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status); |
2830 | printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status); | ||
2831 | return status; | 2828 | return status; |
2832 | } | 2829 | } |
2833 | 2830 | ||
@@ -2886,8 +2883,7 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons | |||
2886 | if ((status = verify_attr_len(xdr, savep, attrlen)) == 0) | 2883 | if ((status = verify_attr_len(xdr, savep, attrlen)) == 0) |
2887 | fattr->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4; | 2884 | fattr->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4; |
2888 | xdr_error: | 2885 | xdr_error: |
2889 | if (status != 0) | 2886 | dprintk("%s: xdr returned %d\n", __FUNCTION__, -status); |
2890 | printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status); | ||
2891 | return status; | 2887 | return status; |
2892 | } | 2888 | } |
2893 | 2889 | ||
@@ -2920,8 +2916,7 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) | |||
2920 | 2916 | ||
2921 | status = verify_attr_len(xdr, savep, attrlen); | 2917 | status = verify_attr_len(xdr, savep, attrlen); |
2922 | xdr_error: | 2918 | xdr_error: |
2923 | if (status != 0) | 2919 | dprintk("%s: xdr returned %d!\n", __FUNCTION__, -status); |
2924 | printk(KERN_NOTICE "%s: xdr error %d!\n", __FUNCTION__, -status); | ||
2925 | return status; | 2920 | return status; |
2926 | } | 2921 | } |
2927 | 2922 | ||
@@ -3088,7 +3083,7 @@ static int decode_open(struct xdr_stream *xdr, struct nfs_openres *res) | |||
3088 | p += bmlen; | 3083 | p += bmlen; |
3089 | return decode_delegation(xdr, res); | 3084 | return decode_delegation(xdr, res); |
3090 | xdr_error: | 3085 | xdr_error: |
3091 | printk(KERN_NOTICE "%s: xdr error!\n", __FUNCTION__); | 3086 | dprintk("%s: Bitmap too large! Length = %u\n", __FUNCTION__, bmlen); |
3092 | return -EIO; | 3087 | return -EIO; |
3093 | } | 3088 | } |
3094 | 3089 | ||