The patch titled fsstack-introduce-fsstack_copy_attrinode_-tidy has been added to the -mm tree. Its filename is fsstack-introduce-fsstack_copy_attrinode_-tidy.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fsstack-introduce-fsstack_copy_attrinode_-tidy From: Andrew Morton <akpm@xxxxxxxx> Remove unneeded wrapper. Cc: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx> Cc: Michael Halcrow <mhalcrow@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/stack.c | 10 ++++------ include/linux/fs_stack.h | 12 ++---------- 2 files changed, 6 insertions(+), 16 deletions(-) diff -puN fs/stack.c~fsstack-introduce-fsstack_copy_attrinode_-tidy fs/stack.c --- a/fs/stack.c~fsstack-introduce-fsstack_copy_attrinode_-tidy +++ a/fs/stack.c @@ -11,13 +11,13 @@ void fsstack_copy_inode_size(struct inod i_size_write(dst, i_size_read((struct inode *)src)); dst->i_blocks = src->i_blocks; } +EXPORT_SYMBOL_GPL(fsstack_copy_inode_size); /* copy all attributes; get_nlinks is optional way to override the i_nlink * copying */ -void __fsstack_copy_attr_all(struct inode *dest, - const struct inode *src, - int (*get_nlinks)(struct inode *)) +void fsstack_copy_attr_all(struct inode *dest, const struct inode *src, + int (*get_nlinks)(struct inode *)) { if (!get_nlinks) dest->i_nlink = src->i_nlink; @@ -34,6 +34,4 @@ void __fsstack_copy_attr_all(struct inod dest->i_blkbits = src->i_blkbits; dest->i_flags = src->i_flags; } - -EXPORT_SYMBOL_GPL(fsstack_copy_inode_size); -EXPORT_SYMBOL_GPL(__fsstack_copy_attr_all); +EXPORT_SYMBOL_GPL(fsstack_copy_attr_all); diff -puN include/linux/fs_stack.h~fsstack-introduce-fsstack_copy_attrinode_-tidy include/linux/fs_stack.h --- a/include/linux/fs_stack.h~fsstack-introduce-fsstack_copy_attrinode_-tidy +++ a/include/linux/fs_stack.h @@ -8,9 +8,8 @@ #include <linux/fs.h> /* externs for fs/stack.c */ -extern void __fsstack_copy_attr_all(struct inode *dest, - const struct inode *src, - int (*get_nlinks)(struct inode *)); +extern void fsstack_copy_attr_all(struct inode *dest, const struct inode *src, + int (*get_nlinks)(struct inode *)); extern void fsstack_copy_inode_size(struct inode *dst, const struct inode *src); @@ -29,11 +28,4 @@ static inline void fsstack_copy_attr_tim dest->i_ctime = src->i_ctime; } -static inline void fsstack_copy_attr_all(struct inode *dest, - const struct inode *src) -{ - __fsstack_copy_attr_all(dest, src, NULL); -} - #endif /* _LINUX_FS_STACK_H */ - _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch ioc4-enable-build-on-non-sn2.patch remove_mapping-fix.patch proc_numbuf-is-wrong.patch rename-net_random-to-random32.patch remove-carta_random32.patch vmalloc-dont-pass-__gfp_zero-to-slab.patch acpi_processor_latency_notifier-up-warning-fix.patch swsusp-fix-memory-leaks.patch knfsd-allow-lockd-to-drop-replys-as-appropriate.patch revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch separate-bdi-congestion-functions-from-queue-congestion-functions.patch revert-generic_file_buffered_write-handle-zero-length-iovec-segments.patch revert-generic_file_buffered_write-deadlock-on-vectored-write.patch generic_file_buffered_write-cleanup.patch mm-fix-pagecache-write-deadlocks.patch i386-acpi-build-fix.patch acpi-cpufreq-remove-dead-code.patch acpi-asus-s3-resume-fix.patch sony_apci-resume.patch speedstep-centrino-remove-dead-code.patch revert-gregkh-driver-driver-core-fixes-sysfs_create_group-retval-in-topology.c.patch git-dvb.patch git-dvb-fixup.patch git-infiniband.patch git-input.patch git-input-fixup.patch git-libata-all.patch mtd-maps-support-for-bios-flash-chips-on-intel-esb2-southbridge.patch git-netdev-all.patch libphy-dont-do-that.patch drivers-net-ns83820c-add-paramter-to-disable-auto.patch git-pcmcia-fixup.patch git-serial-fixup.patch revert-gregkh-pci-pci-check-that-mwi-bit-really-did-get-set.patch git-scsi-target-fixup.patch git-scsi-target-vs-git-block.patch fix-gregkh-usb-usbatm-fix-tiny-race.patch xpad-dance-pad-support.patch usb-gadget-net2280-handle-sysfs-errors-fix.patch git-watchdog.patch x86_64-dump_trace-atomicity-fix.patch spinlock-debug-all-cpu-backtrace.patch i386-fix-cfi_signal_frame-copy-n-paste-error.patch xfs-rename-uio_read.patch touchkit-ps-2-touchscreen-driver.patch get-rid-of-zone_table.patch new-scheme-to-preempt-swap-token-tidy.patch balance_pdgat-cleanup.patch radix-tree-rcu-lockless-readside.patch acx1xx-wireless-driver.patch swsusp-add-resume_offset-command-line-parameter-rev-2.patch s390-qdio-build-fix.patch deprecate-smbfs-in-favour-of-cifs.patch edac-new-opteron-athlon64-memory-controller-driver.patch kbuild-dont-put-temp-files-in-the-source-tree.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch drivers-add-lcd-support-3-Kconfig-fix.patch fsstack-introduce-fsstack_copy_attrinode_-tidy.patch bug-test-1.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch fs-cache-provide-a-filesystem-specific-syncable-page-bit-ext4.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching-12-fix.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch swap_prefetch-vs-zoned-counters.patch readahead-sysctl-parameters.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch make-kmem_cache_destroy-return-void-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch reiser4-get_sb_dev-fix.patch reiser4-vs-zoned-allocator.patch hpt3xx-rework-rate-filtering-tidy.patch gtod-persistent-clock-support-i386.patch hrtimers-state-tracking.patch clockevents-drivers-for-i386.patch gtod-mark-tsc-unusable-for-highres-timers.patch round_jiffies-infrastructure-fix.patch kevent-core-files-fix.patch kevent-core-files-s390-hack.patch kevent-socket-notifications-fix-2.patch kevent-socket-notifications-fix-4.patch kevent-timer-notifications-fix.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.patch restore-rogue-readahead-printk.patch put_bh-debug.patch acpi_format_exception-debug.patch jmicron-warning-fix.patch squash-ipc-warnings.patch squash-udf-warnings.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