diff options
| author |   ChenXiaoSong <chenxiaosong2@huawei.com> | 2022-03-29 19:32:08 +0800 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2022-03-29 22:14:00 -0400 |
| commit | b243874f6f9568b2daf1a00e9222cacdc15e159c (patch) | |
| tree | 8b367ae6df9cbcf655baca2c9a1e63311706e33a /fs/nfs/dir.c | |
| parent | Revert "NFSv4: Handle the special Linux file open access mode" (diff) | |
| download | linux-dev-b243874f6f9568b2daf1a00e9222cacdc15e159c.tar.xz linux-dev-b243874f6f9568b2daf1a00e9222cacdc15e159c.zip | |
NFSv4: fix open failure with O_ACCMODE flag
open() with O_ACCMODE|O_DIRECT flags secondly will fail.
Reproducer:
1. mount -t nfs -o vers=4.2 $server_ip:/ /mnt/
2. fd = open("/mnt/file", O_ACCMODE|O_DIRECT|O_CREAT)
3. close(fd)
4. fd = open("/mnt/file", O_ACCMODE|O_DIRECT)
Server nfsd4_decode_share_access() will fail with error nfserr_bad_xdr when
client use incorrect share access mode of 0.
Fix this by using NFS4_SHARE_ACCESS_BOTH share access mode in client,
just like firstly opening.
Fixes: ce4ef7c0a8a05 ("NFS: Split out NFS v4 file operations")
Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index bac4cf1a308e..0365063b85a2 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1991,16 +1991,6 @@ const struct dentry_operations nfs4_dentry_operations = { }; EXPORT_SYMBOL_GPL(nfs4_dentry_operations); -static fmode_t flags_to_mode(int flags) -{ - fmode_t res = (__force fmode_t)flags & FMODE_EXEC; - if ((flags & O_ACCMODE) != O_WRONLY) - res |= FMODE_READ; - if ((flags & O_ACCMODE) != O_RDONLY) - res |= FMODE_WRITE; - return res; -} - static struct nfs_open_context *create_nfs_open_context(struct dentry *dentry, int open_flags, struct file *filp) { return alloc_nfs_open_context(dentry, flags_to_mode(open_flags), filp); |