diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2016-12-02 22:53:30 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-12-09 23:47:10 -0500 |
commit | dff25ddb48086afcb434770caa3d6849a4489b85 (patch) | |
tree | 5072c5bf9d907cabcfa354e7c100d0302b10cb36 /fs/nfs/dir.c | |
parent | d9152114f7c9abb096275b72db8527c004d57bf9 (diff) | |
download | linux-stable-dff25ddb48086afcb434770caa3d6849a4489b85.tar.gz linux-stable-dff25ddb48086afcb434770caa3d6849a4489b85.tar.bz2 linux-stable-dff25ddb48086afcb434770caa3d6849a4489b85.zip |
nfs: add support for the umask attribute
Clients can set the umask attribute when creating files to cause the
server to apply it always except when inheriting permissions from the
parent directory. That way, the new files will end up with the same
permissions as files created locally.
See https://tools.ietf.org/html/draft-ietf-nfsv4-umask-02 for more details.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 7483722162fa..cb22a9f9ae7e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1529,8 +1529,13 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, return -ENAMETOOLONG; if (open_flags & O_CREAT) { + struct nfs_server *server = NFS_SERVER(dir); + + if (!(server->attr_bitmask[2] & FATTR4_WORD2_MODE_UMASK)) + mode &= ~current_umask(); + attr.ia_valid |= ATTR_MODE; - attr.ia_mode = mode & ~current_umask(); + attr.ia_mode = mode; } if (open_flags & O_TRUNC) { attr.ia_valid |= ATTR_SIZE; |