The patch titled
reiserfs-fix-handling-of-device-names-with-s-in-them tidy
has been removed from the -mm tree. Its filename is
reiserfs-fix-handling-of-device-names-with-s-in-them-tidy.patch
This patch was dropped because it was folded into reiserfs-fix-handling-of-device-names-with-s-in-them.patch
------------------------------------------------------
Subject: reiserfs-fix-handling-of-device-names-with-s-in-them tidy
From: Andrew Morton <akpm@xxxxxxxx>
"bdev" is conventionally a `struct block_device*'. We usually use b[] for
holding bdev names..
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/reiserfs/procfs.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN fs/reiserfs/procfs.c~reiserfs-fix-handling-of-device-names-with-s-in-them-tidy fs/reiserfs/procfs.c
--- a/fs/reiserfs/procfs.c~reiserfs-fix-handling-of-device-names-with-s-in-them-tidy
+++ a/fs/reiserfs/procfs.c
@@ -492,17 +492,17 @@ static void add_file(struct super_block
int reiserfs_proc_info_init(struct super_block *sb)
{
- char bdev[BDEVNAME_SIZE];
+ char b[BDEVNAME_SIZE];
char *s;
/* Some block devices use /'s */
- strlcpy(bdev, reiserfs_bdevname(sb), BDEVNAME_SIZE);
- s = strchr(bdev, '/');
+ strlcpy(b, reiserfs_bdevname(sb), BDEVNAME_SIZE);
+ s = strchr(b, '/');
if (s)
*s = '!';
spin_lock_init(&__PINFO(sb).lock);
- REISERFS_SB(sb)->procdir = proc_mkdir(bdev, proc_info_root);
+ REISERFS_SB(sb)->procdir = proc_mkdir(b, proc_info_root);
if (REISERFS_SB(sb)->procdir) {
REISERFS_SB(sb)->procdir->owner = THIS_MODULE;
REISERFS_SB(sb)->procdir->data = sb;
@@ -516,19 +516,19 @@ int reiserfs_proc_info_init(struct super
return 0;
}
reiserfs_warning(sb, "reiserfs: cannot create /proc/%s/%s",
- proc_info_root_name, bdev);
+ proc_info_root_name, b);
return 1;
}
int reiserfs_proc_info_done(struct super_block *sb)
{
struct proc_dir_entry *de = REISERFS_SB(sb)->procdir;
- char bdev[BDEVNAME_SIZE];
+ char b[BDEVNAME_SIZE];
char *s;
/* Some block devices use /'s */
- strlcpy(bdev, reiserfs_bdevname(sb), BDEVNAME_SIZE);
- s = strchr(bdev, '/');
+ strlcpy(b, reiserfs_bdevname(sb), BDEVNAME_SIZE);
+ s = strchr(b, '/');
if (s)
*s = '!';
@@ -545,7 +545,7 @@ int reiserfs_proc_info_done(struct super
__PINFO(sb).exiting = 1;
spin_unlock(&__PINFO(sb).lock);
if (proc_info_root) {
- remove_proc_entry(bdev, proc_info_root);
+ remove_proc_entry(b, proc_info_root);
REISERFS_SB(sb)->procdir = NULL;
}
return 0;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
struct-file-leakage.patch
del_timer_sync-add-cpu_relax.patch
rtc-subsystem-add-isl1208-support.patch
reiserfs-fix-handling-of-device-names-with-s-in-them.patch
reiserfs-fix-handling-of-device-names-with-s-in-them-tidy.patch
add-function-documentation-for-register_chrdev-fix.patch
reiserfs-on-demand-bitmap-loading.patch
per-task-delay-accounting-taskstats-interface.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays.patch
delay-accounting-taskstats-interface-send-tgid-once.patch
per-task-delay-accounting-taskstats-interface-control-exit-data-through-cpumasks.patch
task-watchers-task-watchers.patch
task-watchers-add-support-for-per-task-watchers.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-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
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
jmicron-warning-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
