diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2018-03-20 17:03:07 -0400 |
---|---|---|
committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2018-04-10 16:06:22 -0400 |
commit | e8d8aa46be413930fb3e084f9a7e815f87f72f1f (patch) | |
tree | 1985b186643c52d2ab15f1e4a96cf3a20921e6fa /fs/nfs/nfs4xdr.c | |
parent | 85e3dd44c514a8bed6c713df4af657be83d00f68 (diff) |
NFSv4: Allow GFP_NOIO sleeps in decode_attr_owner/decode_attr_group
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 65c9c4175145..6b08f6b1addf 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -3981,7 +3981,7 @@ static int decode_attr_owner(struct xdr_stream *xdr, uint32_t *bitmap, | |||
3981 | bitmap[1] &= ~FATTR4_WORD1_OWNER; | 3981 | bitmap[1] &= ~FATTR4_WORD1_OWNER; |
3982 | 3982 | ||
3983 | if (owner_name != NULL) { | 3983 | if (owner_name != NULL) { |
3984 | len = decode_nfs4_string(xdr, owner_name, GFP_NOWAIT); | 3984 | len = decode_nfs4_string(xdr, owner_name, GFP_NOIO); |
3985 | if (len <= 0) | 3985 | if (len <= 0) |
3986 | goto out; | 3986 | goto out; |
3987 | dprintk("%s: name=%s\n", __func__, owner_name->data); | 3987 | dprintk("%s: name=%s\n", __func__, owner_name->data); |
@@ -4016,7 +4016,7 @@ static int decode_attr_group(struct xdr_stream *xdr, uint32_t *bitmap, | |||
4016 | bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP; | 4016 | bitmap[1] &= ~FATTR4_WORD1_OWNER_GROUP; |
4017 | 4017 | ||
4018 | if (group_name != NULL) { | 4018 | if (group_name != NULL) { |
4019 | len = decode_nfs4_string(xdr, group_name, GFP_NOWAIT); | 4019 | len = decode_nfs4_string(xdr, group_name, GFP_NOIO); |
4020 | if (len <= 0) | 4020 | if (len <= 0) |
4021 | goto out; | 4021 | goto out; |
4022 | dprintk("%s: name=%s\n", __func__, group_name->data); | 4022 | dprintk("%s: name=%s\n", __func__, group_name->data); |