The patch titled revert faster-ext2_clear_inode has been added to the -mm tree. Its filename is revert-faster-ext2_clear_inode.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: revert faster-ext2_clear_inode From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> ext2-reservations needs this back again. Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Joern Engel <joern@xxxxxxxxx> Cc: Andreas Gruenbacher <agruen@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext2/super.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff -puN fs/ext2/super.c~revert-faster-ext2_clear_inode fs/ext2/super.c --- a/fs/ext2/super.c~revert-faster-ext2_clear_inode +++ a/fs/ext2/super.c @@ -185,9 +185,9 @@ static void destroy_inodecache(void) kmem_cache_destroy(ext2_inode_cachep); } -#ifdef CONFIG_EXT2_FS_POSIX_ACL static void ext2_clear_inode(struct inode *inode) { +#ifdef CONFIG_EXT2_FS_POSIX_ACL struct ext2_inode_info *ei = EXT2_I(inode); if (ei->i_acl && ei->i_acl != EXT2_ACL_NOT_CACHED) { @@ -198,10 +198,8 @@ static void ext2_clear_inode(struct inod posix_acl_release(ei->i_default_acl); ei->i_default_acl = EXT2_ACL_NOT_CACHED; } -} -#else -#define ext2_clear_inode NULL #endif +} static int ext2_show_options(struct seq_file *seq, struct vfsmount *vfs) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch slow-down-printk-during-boot.patch slow-down-printk-during-boot-fix-2.patch git-acpi.patch git-acpi-fix-git-rejects.patch acpi-add-reboot-mechanism-fix.patch git-alsa.patch working-3d-dri-intel-agpko-resume-for-i815-chip.patch revert-gregkh-driver-block-device.patch git-dvb.patch git-input.patch adbhid-produce-all-capslock-key-events-fix.patch git-kbuild.patch git-kvm.patch git-leds.patch libata-add-irq_flags-to-struct-pata_platform_info-fix.patch git-mtd.patch e1000new-build-fix.patch e1000new-build-fix-2.patch revert-gregkh-pci-pci_bridge-device.patch i386-add-support-for-picopower-irq-router.patch try-parent-numa_node-at-first-before-using-default-v2-fix.patch git-scsi-misc.patch aacraid-rename-check_reset.patch git-unionfs.patch git-block-vs-git-unionfs.patch x86_64-clean-up-apicid_to_node-declaration.patch clockevents-fix-resume-logic-xen-fix.patch ntp-move-the-cmos-update-code-into-ntpc.patch x86_64-dynticks-disable-hpet_id_legsup-hpets.patch mmconfig-validate-against-acpi-motherboard-resources.patch git-xfs.patch git-kgdb-fixup-2.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch sparsemem-record-when-a-section-has-a-valid-mem_map-fix.patch fs-introduce-write_begin-write_end-and-perform_write-aops.patch bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks.patch maps2-move-the-page-walker-code-to-lib.patch maps2-add-proc-pid-pagemap-interface.patch slub-slab-validation-move-tracking-information-alloc-outside-of-melstuff.patch hugetlbfs-read-support-fix.patch security-convert-lsm-into-a-static-interface-fix.patch file-capabilities-clear-caps-cleanup-fix.patch capabilityh-remove-include-of-currenth.patch cache-pipe-buf-page-address-for-non-highmem-arch.patch force-erroneous-inclusions-of-compiler-h-files-to-be-errors-fix.patch driver-for-the-atmel-on-chip-ssc-on-at32ap-and-at91-fix.patch add-kernel-notifierc-fix.patch fix-swiotlb_sync_single_range.patch fs-9p-convc-error-path-fix.patch loop-use-unlocked_ioctl.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-2.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-3.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-4.patch writeback-fix-comment-use-helper-function.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-5.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-6.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-7.patch revert-faster-ext2_clear_inode.patch intel-iommu-pci-generic-helper-function.patch intel-iommu-iova-allocation-and-management-routines.patch intel-iommu-intel-iommu-driver.patch intel-iommu-iommu-floppy-workaround.patch revoke-wire-up-i386-system-calls.patch revoke-vs-git-block.patch containersv10-basic-container-framework-fix.patch containersv10-basic-container-framework-fix-2.patch containersv10-example-cpu-accounting-subsystem-fix.patch containersv10-add-tasks-file-interface-fix.patch containersv10-add-fork-exit-hooks-fix.patch containersv10-add-container_clone-interface-fix.patch containersv10-add-procfs-interface-fix.patch containersv10-share-css_group-arrays-between-tasks-with-same-container-memberships-fix.patch containersv10-simple-debug-info-subsystem-fix.patch containersv10-simple-debug-info-subsystem-fix-2.patch add-containerstats-v3-fix.patch pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces-fix.patch reiser4.patch git-block-vs-reiser4.patch page-owner-tracking-leak-detector.patch check_dirty_inode_list.patch alloc_pages-debug.patch w1-build-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html