summaryrefslogtreecommitdiff
path: root/fs/cifs/cifsacl.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-09-22 12:54:56 (GMT)
committerJames Morris <james.l.morris@oracle.com>2014-09-22 12:54:56 (GMT)
commit35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch)
treeaa0e546b39fa4d0a434919ff106721dfc3777a3d /fs/cifs/cifsacl.c
parent6f98e892884c32b9273ecce1332b849bcad3b8b1 (diff)
parentd1ac5540455c3a2a11e943e19e2dc044cebe147d (diff)
downloadlinux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'fs/cifs/cifsacl.c')
-rw-r--r--fs/cifs/cifsacl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 7ff866d..6d00c41 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -84,7 +84,6 @@ static struct key_type cifs_idmap_key_type = {
.instantiate = cifs_idmap_key_instantiate,
.destroy = cifs_idmap_key_destroy,
.describe = user_describe,
- .match = user_match,
};
static char *