diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-05 23:29:00 (GMT) |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-05 23:29:00 (GMT) |
| commit | 0250abcd726b4eba8a6175f09656fe544ed6491a (patch) | |
| tree | 43ded3d5f9b8b5684879c61ff6d03effdb7ea7c0 /fs | |
| parent | 74f430cd0fdee1bdfb25708ee1e52fc860535a89 (diff) | |
| parent | d55201ce08bfae40ae0062be126f49471a55bcad (diff) | |
| download | linux-0250abcd726b4eba8a6175f09656fe544ed6491a.tar.xz | |
Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifsacl.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfs4idmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 3f93125..71e8a56 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -360,7 +360,7 @@ init_cifs_idmap(void) GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ, - KEY_ALLOC_NOT_IN_QUOTA, NULL); + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(keyring)) { ret = PTR_ERR(keyring); goto failed_put_cred; diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c index 5ba22c6..c444285 100644 --- a/fs/nfs/nfs4idmap.c +++ b/fs/nfs/nfs4idmap.c @@ -201,7 +201,7 @@ int nfs_idmap_init(void) GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred, (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ, - KEY_ALLOC_NOT_IN_QUOTA, NULL); + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL); if (IS_ERR(keyring)) { ret = PTR_ERR(keyring); goto failed_put_cred; |