Просмотр исходного кода

NFSD: use nfserr for status after decode_cb_op_status

Bugs introduced in 85a56480191ca9f08fc775c129b9eb5c8c1f2c05
"NFSD: Update XDR decoders in NFSv4 callback client"

Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Benny Halevy 14 лет назад
Родитель
Сommit
0af3f814cc
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      fs/nfsd/nfs4callback.c

+ 2 - 4
fs/nfsd/nfs4callback.c

@@ -484,7 +484,7 @@ static int decode_cb_sequence4res(struct xdr_stream *xdr,
 out:
 out:
 	return status;
 	return status;
 out_default:
 out_default:
-	return nfs_cb_stat_to_errno(status);
+	return nfs_cb_stat_to_errno(nfserr);
 }
 }
 
 
 /*
 /*
@@ -564,11 +564,9 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp,
 	if (unlikely(status))
 	if (unlikely(status))
 		goto out;
 		goto out;
 	if (unlikely(nfserr != NFS4_OK))
 	if (unlikely(nfserr != NFS4_OK))
-		goto out_default;
+		status = nfs_cb_stat_to_errno(nfserr);
 out:
 out:
 	return status;
 	return status;
-out_default:
-	return nfs_cb_stat_to_errno(status);
 }
 }
 
 
 /*
 /*