Merge remote-tracking branch 'bcm2835/for-next'

[deliverable/linux.git] / fs / overlayfs / dir.c

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index f485dd4288e486e684f4090bf54c1a3fa7510f97..1560fdc09a5fabf12ed678a3e87e78bb3e43cce2 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -1004,9 +1004,9 @@ const struct inode_operations ovl_dir_inode_operations = {
        .permission     = ovl_permission,
        .getattr        = ovl_dir_getattr,
        .setxattr       = generic_setxattr,
-       .getxattr       = ovl_getxattr,
+       .getxattr       = generic_getxattr,
        .listxattr      = ovl_listxattr,
-       .removexattr    = ovl_removexattr,
+       .removexattr    = generic_removexattr,
        .get_acl        = ovl_get_acl,
        .update_time    = ovl_update_time,
 };