The patch titled
fs/reiser4/: possible cleanups
has been added to the -mm tree. Its filename is
fs-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 functions statis:
- plugin/file/file_conversion.c: prepped_dclust_ok()
- plugin/file/file_conversion.c: cryptcompress2unixfile()
- #if 0 the following unused global functions:
- plugin/file/cryptcompress.c: prepare_write_cryptcompress()
- plugin/file/file_conversion.c: prot_delete_object_cryptcompress()
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Edward Shishkin <edward@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/reiser4/plugin/file/cryptcompress.c | 2 ++
fs/reiser4/plugin/file/file.h | 3 ---
fs/reiser4/plugin/file/file_conversion.c | 8 +++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff -puN fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/cryptcompress.c
--- a/fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-possible-cleanups-2
+++ a/fs/reiser4/plugin/file/cryptcompress.c
@@ -3768,11 +3768,13 @@ int release_cryptcompress(struct inode *
return 0;
}
+#if 0
int prepare_write_cryptcompress(struct file *file, struct page *page,
unsigned from, unsigned to)
{
return prepare_write_common(file, page, from, to);
}
+#endif /* 0 */
/*
diff -puN fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file.h
--- a/fs/reiser4/plugin/file/file.h~fs-reiser4-possible-cleanups-2
+++ a/fs/reiser4/plugin/file/file.h
@@ -203,8 +203,6 @@ ssize_t read_cryptcompress(struct file *
ssize_t prot_read_cryptcompress(struct file *, char __user *buf,
size_t read_amount, loff_t * off);
-int prepare_write_cryptcompress(struct file *file, struct page *page,
- unsigned from, unsigned to);
ssize_t write_cryptcompress(struct file *, const char __user *buf, size_t write_amount,
loff_t * off, int * conv);
ssize_t prot_write_cryptcompress(struct file *, const char __user *buf, size_t write_amount,
@@ -230,7 +228,6 @@ int key_by_inode_cryptcompress(struct in
int create_cryptcompress(struct inode *, struct inode *,
reiser4_object_create_data *);
int delete_object_cryptcompress(struct inode *);
-int prot_delete_object_cryptcompress(struct inode *);
void init_inode_data_cryptcompress(struct inode *, reiser4_object_create_data *,
int create);
int cut_tree_worker_cryptcompress(tap_t *, const reiser4_key * from_key,
diff -puN fs/reiser4/plugin/file/file_conversion.c~fs-reiser4-possible-cleanups-2 fs/reiser4/plugin/file/file_conversion.c
--- a/fs/reiser4/plugin/file/file_conversion.c~fs-reiser4-possible-cleanups-2
+++ a/fs/reiser4/plugin/file/file_conversion.c
@@ -239,7 +239,7 @@ static void finish_check_compressibility
}
#if REISER4_DEBUG
-int prepped_dclust_ok(hint_t * hint)
+static int prepped_dclust_ok(hint_t * hint)
{
reiser4_key key;
coord_t * coord = &hint->ext_coord.coord;
@@ -410,8 +410,8 @@ static int complete_file_conversion(stru
/* do conversion */
-int cryptcompress2unixfile(struct file *file, struct inode * inode,
- reiser4_cluster_t * clust)
+static int cryptcompress2unixfile(struct file *file, struct inode * inode,
+ reiser4_cluster_t * clust)
{
int i;
int result = 0;
@@ -577,10 +577,12 @@ ssize_t prot_sendfile_cryptcompress(stru
(file, ppos, count, actor, target));
}
+#if 0
int prot_delete_object_cryptcompress(struct inode *inode)
{
return PROT_PASSIVE(int, delete_object, (inode));
}
+#endif /* 0 */
/*
Local variables:
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
drivers-rtc-rtc-rs5c372c-fix-a-null-dereference.patch
make-drivers-acpi-baycdrive_bays-static.patch
make-drivers-acpi-eccec_ecdt-static.patch
git-alsa.patch
tidy-gregkh-driver-udev-compatible-hack.patch
drivers-media-video-cafe_ccicc-make-a-function-static.patch
git-gfs2-nmw.patch
fs-dlm-lowcomms-tcpc-remove-2-functions.patch
git-mtd.patch
git-net.patch
net-uninline-skb_put-fix.patch
git-ocfs2.patch
drivers-pci-hotplug-ibmphp_pcic-fix-null-dereference.patch
git-scsi-misc.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
drivers-scsi-aic7xxx-make-functions-static.patch
drivers-scsi-megaraid-megaraid_sasc-make-2-functions-static.patch
make-drivers-usb-host-u132-hcdcu132_hcd_wait-static.patch
make-drivers-usb-input-wacom_syscwacom_sys_irq-static.patch
git-cryptodev.patch
make-mm-thrashcglobal_faults-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
remove-drivers-pci-searchcpci_find_device_reverse.patch
ext4_ext_split-remove-dead-code.patch
the-scheduled-removal-of-some-oss-options.patch
make-arch-i386-pci-commoncpci_bf_sort-static.patch
make-mm-shmemcshmem_xattr_security_handler-static.patch
remove-kernel-lockdepclockdep_internal.patch
make-kernel-signalckill_proc_info-static.patch
make-ecryptfs_version_str_map-static.patch
make-fs-jbd-transactionc__journal_temp_unlink_buffer-static.patch
make-fs-jbd2-transactionc__jbd2_journal_temp_unlink_buffer-static.patch
fs-lockd-hostc-make-2-functions-static.patch
make-fs-proc-basecproc_pid_instantiate-static.patch
make-ext2_get_blocks-static.patch
reiser4-export-remove_from_page_cache-fix.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
fs-reiser4-possible-cleanups-2.patch
make-drivers-md-dm-snapcksnapd-static.patch
gtod-persistent-clock-support-core-remove-kernel-timercwall_jiffies.patch
gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-make-kernel-timerc__next_timer_interrupt-static.patch
updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.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
-
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
