diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-27 17:04:17 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-27 17:10:40 -0500 |
commit | be36e185bd26388355d3ea1847278b96ab350792 (patch) | |
tree | aa4b22684b369725d38133a38f06b233ea1facd7 /fs | |
parent | 7a27eae362ae1494b7a4f4c4d9137fc04fa34e63 (diff) |
NFSv4: nfs4_open_recover_helper() must set share access
The share access mode is now specified as an argument in the nfs4_opendata,
and so nfs4_open_recover_helper() needs to call nfs4_map_atomic_open_share()
in order to set it.
Fixes: 6ae373394c42 ("NFSv4.1: Ask for no delegation on OPEN if using O_DIRECT")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfs4proc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 88180ac5ea0e..4e41340e957d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -1552,6 +1552,9 @@ static int nfs4_open_recover_helper(struct nfs4_opendata *opendata, fmode_t fmod | |||
1552 | 1552 | ||
1553 | opendata->o_arg.open_flags = 0; | 1553 | opendata->o_arg.open_flags = 0; |
1554 | opendata->o_arg.fmode = fmode; | 1554 | opendata->o_arg.fmode = fmode; |
1555 | opendata->o_arg.share_access = nfs4_map_atomic_open_share( | ||
1556 | NFS_SB(opendata->dentry->d_sb), | ||
1557 | fmode, 0); | ||
1555 | memset(&opendata->o_res, 0, sizeof(opendata->o_res)); | 1558 | memset(&opendata->o_res, 0, sizeof(opendata->o_res)); |
1556 | memset(&opendata->c_res, 0, sizeof(opendata->c_res)); | 1559 | memset(&opendata->c_res, 0, sizeof(opendata->c_res)); |
1557 | nfs4_init_opendata_res(opendata); | 1560 | nfs4_init_opendata_res(opendata); |