The patch titled fs/reiser4/: possible cleanups has been added to the -mm tree. Its filename is reiser4-possible-cleanups-2.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fs/reiser4/: possible cleanups From: Adrian Bunk <bunk@xxxxxxxxx> - make the following needlessly global function static: - plugin/file/file.c: hint_validate() - #if 0 the following unused global function: - jnode.c: page_detach_jnode() Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx> Cc: Hans Reiser <reiser@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/reiser4/jnode.c | 2 ++ fs/reiser4/jnode.h | 3 --- fs/reiser4/plugin/file/file.c | 4 +++- fs/reiser4/plugin/file/file.h | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff -puN fs/reiser4/jnode.c~reiser4-possible-cleanups-2 fs/reiser4/jnode.c --- a/fs/reiser4/jnode.c~reiser4-possible-cleanups-2 +++ a/fs/reiser4/jnode.c @@ -697,6 +697,7 @@ void page_clear_jnode(struct page *page, page_cache_release(page); } +#if 0 /* it is only used in one place to handle error */ void page_detach_jnode(struct page *page, struct address_space *mapping, @@ -716,6 +717,7 @@ page_detach_jnode(struct page *page, str } unlock_page(page); } +#endif /* 0 */ /* return @node page locked. diff -puN fs/reiser4/jnode.h~reiser4-possible-cleanups-2 fs/reiser4/jnode.h --- a/fs/reiser4/jnode.h~reiser4-possible-cleanups-2 +++ a/fs/reiser4/jnode.h @@ -486,9 +486,6 @@ static inline int jnode_is_loaded(const return atomic_read(&node->d_count) > 0; } -extern void page_detach_jnode(struct page *page, - struct address_space *mapping, - unsigned long index) NONNULL; extern void page_clear_jnode(struct page *page, jnode * node) NONNULL; static inline void jnode_set_reloc(jnode * node) diff -puN fs/reiser4/plugin/file/file.c~reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file.c --- a/fs/reiser4/plugin/file/file.c~reiser4-possible-cleanups-2 +++ a/fs/reiser4/plugin/file/file.c @@ -26,6 +26,8 @@ static int unpack(struct file *file, struct inode *inode, int forever); static void drop_access(unix_file_info_t *); +static int hint_validate(hint_t * hint, const reiser4_key * key, int check_key, + znode_lock_mode lock_mode); /* get unix file plugin specific portion of inode */ unix_file_info_t *unix_file_inode_data(const struct inode *inode) @@ -747,7 +749,7 @@ static int all_but_offset_key_eq(const r } #endif -int +static int hint_validate(hint_t * hint, const reiser4_key * key, int check_key, znode_lock_mode lock_mode) { diff -puN fs/reiser4/plugin/file/file.h~reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file.h --- a/fs/reiser4/plugin/file/file.h~reiser4-possible-cleanups-2 +++ a/fs/reiser4/plugin/file/file.h @@ -157,8 +157,6 @@ struct hint { void reiser4_set_hint(hint_t *, const reiser4_key *, znode_lock_mode); int hint_is_set(const hint_t *); void reiser4_unset_hint(hint_t *); -int hint_validate(hint_t *, const reiser4_key *, int check_key, - znode_lock_mode); void hint_init_zero(hint_t *); int reiser4_update_file_size(struct inode *, reiser4_key *, int update_sd); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch schedule-obsolete-oss-drivers-for-removal-2nd-round.patch git-alsa.patch drivers-md-kconfig-fix-block-dependency.patch git-cpufreq.patch git-drm.patch git-dvb.patch git-gfs2.patch the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch git-input.patch drivers-input-misc-wistron_btnsc-fix-section-mismatch.patch git-mtd.patch git-net.patch fs-nfs-make-code-static.patch git-ocfs2.patch git-pcmcia.patch drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch git-scsi-misc.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch include-scsi-libsash-should-include-linux-scatterlisth.patch git-cryptodev.patch mm-make-functions-static.patch acx1xx-wireless-driver.patch selinux-enable-configuration-of-max-policy-version-improve-security_selinux_policydb_version_max_value-help-texts.patch avr32-set-kbuild_defconfig.patch drivers-edac-make-code-static.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch reiserfs-warn-about-the-useless-nolargeio-option.patch x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch drivers-char-scx200_gpioc-make-code-static.patch drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch kernel-time-ntpc-possible-cleanups.patch hdaps-unify-and-cache-hdaps-readouts-fix.patch hdaps-add-explicit-hardware-configuration-functions-fix-fix.patch generic-ioremap_page_range-i386-conversion-fix.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-sysctl-hack.patch namespaces-utsname-implement-clone_newuts-flag.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch drivers-ide-cleanups.patch atyfb-possible-cleanups.patch fbcon-make-3-functions-static.patch vt-proper-prototypes-for-some-console-functions.patch md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch srcu-3-add-srcu-operations-to-rcutorture-fix.patch rcu-add-fake-writers-to-rcutorture-tidy.patch the-scheduled-removal-of-some-oss-drivers.patch the-scheduled-removal-of-some-oss-drivers-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-sound-oss-_symsc.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch -- VGER BF report: H 8.48165e-09 - 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