diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-24 21:36:19 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-24 21:36:19 +1000 |
| commit | 4ca332e11df42604e784bd7da9e483160636d05e (patch) | |
| tree | 82e6ba6dff978edc2132e751c19197de50218c7e /fs | |
| parent | 6d6f3328422a3bc56b0d8dd026a5de845d2abfa7 (diff) | |
| parent | 633706a2ee81637be37b6bc02c5336950cc163b5 (diff) | |
| download | op-kernel-dev-4ca332e11df42604e784bd7da9e483160636d05e.zip op-kernel-dev-4ca332e11df42604e784bd7da9e483160636d05e.tar.gz | |
Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/idmap.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 567983d2..7dd55b7 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -174,7 +174,9 @@ static int nfs_map_numeric_to_string(__u32 id, char *buf, size_t buflen) static struct key_type key_type_id_resolver = { .name = "id_resolver", - .instantiate = user_instantiate, + .preparse = user_preparse, + .free_preparse = user_free_preparse, + .instantiate = generic_key_instantiate, .match = user_match, .revoke = user_revoke, .destroy = user_destroy, @@ -282,6 +284,8 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen, desc, "", 0, idmap); mutex_unlock(&idmap->idmap_mutex); } + if (!IS_ERR(rkey)) + set_bit(KEY_FLAG_ROOT_CAN_INVAL, &rkey->flags); kfree(desc); return rkey; @@ -394,7 +398,9 @@ static const struct rpc_pipe_ops idmap_upcall_ops = { static struct key_type key_type_id_resolver_legacy = { .name = "id_legacy", - .instantiate = user_instantiate, + .preparse = user_preparse, + .free_preparse = user_free_preparse, + .instantiate = generic_key_instantiate, .match = user_match, .revoke = user_revoke, .destroy = user_destroy, |
