diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
| commit | 1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch) | |
| tree | 1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /fs/nfs/nfs4xdr.c | |
| parent | d3d33aabac51341065bcce0e9c2d9d27902a08c4 (diff) | |
| parent | e2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (diff) | |
| download | linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz | |
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index dfed4f5c8fcc..4e4441216804 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -3615,6 +3615,7 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st status = 0; if (unlikely(!(bitmap[0] & FATTR4_WORD0_FS_LOCATIONS))) goto out; + bitmap[0] &= ~FATTR4_WORD0_FS_LOCATIONS; status = -EIO; /* Ignore borken servers that return unrequested attrs */ if (unlikely(res == NULL)) |