From: Jianhong Yin <jiyin@redhat.com>
To: linux-nfs@vger.kernel.org
Cc: calum.mackay@oracle.com, jlayton@kernel.org, bcodding@redhat.com,
smayhew@redhat.com, jiyin@redhat.com,
Jianhong Yin <yin-jianhong@163.com>
Subject: [PATCH 4/4] pynfs: fix various types of errors in nfs4.1/nfs4proxy.py
Date: Fri, 27 Mar 2026 12:16:21 +0800 [thread overview]
Message-ID: <20260327041620.2115456-5-jiyin@redhat.com> (raw)
In-Reply-To: <20260327041620.2115456-2-jiyin@redhat.com>
test pass on Fedora-43
Signed-off-by: Jianhong Yin <yin-jianhong@163.com>
---
nfs4.1/nfs4proxy.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/nfs4.1/nfs4proxy.py b/nfs4.1/nfs4proxy.py
index 1b935fa..8cc4002 100755
--- a/nfs4.1/nfs4proxy.py
+++ b/nfs4.1/nfs4proxy.py
@@ -46,7 +46,7 @@ class NFS4Proxy(rpc.Server):
self.cb_versions = [cb_version]
# currently support only root (? fix ? )
rpcsec = rpc.security.instance(rpc.AUTH_SYS)
- self.default_cred = rpcsec.init_cred(uid=0,gid=0,name="root")
+ self.default_cred = rpcsec.init_cred(uid=0,gid=0,name=b"root")
if pipe: #reuse connection
self.pipe = pipe
else:
@@ -60,7 +60,7 @@ class NFS4Proxy(rpc.Server):
return (min(self.cb_versions), max(self.cb_versions))
def _find_method(self, msg):
- method = getattr(self.proxy, 'handle_cb_%i' % msg.proc, None)
+ method = getattr(self.proxy, b'handle_cb_%i' % msg.proc, None)
if method is not None:
return method
return None
@@ -162,8 +162,8 @@ class NFS4Proxy(rpc.Server):
log.debug("** CALLBACK **")
log.debug("Handling NULL")
try:
- self.forward_call(calldata="", callback=callback, procedure=0)
- return rpc.SUCCESS, ''
+ self.forward_call(calldata=b"", callback=callback, procedure=0)
+ return rpc.SUCCESS, b''
except rpc.RPCTimeout:
log.critical("Error: cannot connect to destination server")
return rpc.GARBAGE_ARGS, None
@@ -192,7 +192,7 @@ class NFS4Proxy(rpc.Server):
env = CompoundState(args, cred)
for arg in args.argarray:
env.index += 1
- opname = nfs_opnum4.get(arg.argop, 'op_illegal')
+ opname = nfs_opnum4.get(arg.argop, b'op_illegal')
log.info("*** %s (%d) ***" % (opname, arg.argop))
# look for functions implemented by the proxy
# that override communication
@@ -210,7 +210,7 @@ class NFS4Proxy(rpc.Server):
if error is not None:
result = encode_status_by_name(opname.lower()[3:],
int(error),
- msg="Proxy Rewrite Error")
+ msg=b"Proxy Rewrite Error")
env.results.append(result)
p = nfs4lib.FancyNFS4Packer()
if callback:
@@ -288,7 +288,7 @@ class NFS4Proxy(rpc.Server):
attrs.ca_maxoperations = chan.maxoperations
if chan.maxrequests < attrs.ca_maxrequests:
attrs.ca_maxrequests = chan.maxrequests
- if direction is 0: # client to proxy
+ if direction == 0: # client to proxy
# XXX: this might be buggy with more than one clients (?)
self.start_cb_proxy(arg.opcreate_session.csa_cb_program,
version=1, client_pipe=cred.connection)
@@ -296,7 +296,7 @@ class NFS4Proxy(rpc.Server):
self.fchannel)
_adjust_channel_values(arg.opcreate_session.csa_back_chan_attrs,
self.bchannel)
- elif direction is 1: # proxy to client
+ elif direction == 1: # proxy to client
pass
#FUNCTION OVERRIDING END
--
2.53.0
prev parent reply other threads:[~2026-03-27 4:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-27 4:16 [PATCH v2 1/4] pynfs: fix nfs4.1/nfs4server.py Jianhong Yin
2026-03-27 4:16 ` [PATCH 2/4] pynfs: more nfs4.1/nfs4server.py fixes Jianhong Yin
2026-03-27 4:16 ` [PATCH 3/4] pynfs: fix nfs4.1/nfs4server.py error with python3.12+ Jianhong Yin
2026-03-27 4:16 ` Jianhong Yin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260327041620.2115456-5-jiyin@redhat.com \
--to=jiyin@redhat.com \
--cc=bcodding@redhat.com \
--cc=calum.mackay@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=smayhew@redhat.com \
--cc=yin-jianhong@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).