The patch titled
openpromfs-factorize-out-tidy
has been removed from the -mm tree. Its filename is
openpromfs-factorize-out-tidy.patch
This patch was dropped because it was folded into openpromfs-factorize-out.patch
------------------------------------------------------
Subject: openpromfs-factorize-out-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Jan Engelhardt <jengelh@xxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/openpromfs/inode.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff -puN fs/openpromfs/inode.c~openpromfs-factorize-out-tidy fs/openpromfs/inode.c
--- devel/fs/openpromfs/inode.c~openpromfs-factorize-out-tidy 2006-05-17 23:41:42.000000000 -0700
+++ devel-akpm/fs/openpromfs/inode.c 2006-05-17 23:41:42.000000000 -0700
@@ -64,7 +64,8 @@ static int openpromfs_readdir(struct fil
static struct dentry *openpromfs_lookup(struct inode *, struct dentry *dentry, struct nameidata *nd);
static int openpromfs_unlink (struct inode *, struct dentry *dentry);
-static inline u16 PTR_NOD(void *p) {
+static inline u16 ptr_nod(void *p)
+{
return (long)p & 0xFFFF;
}
@@ -99,9 +100,9 @@ static ssize_t property_read(struct file
char buffer[64];
if (!filp->private_data) {
- node = nodes[PTR_NOD(inode->u.generic_ip)].node;
+ node = nodes[ptr_nod(inode->u.generic_ip)].node;
i = ((u32)(long)inode->u.generic_ip) >> 16;
- if (PTR_NOD(inode->u.generic_ip) == aliases) {
+ if (ptr_nod(inode->u.generic_ip) == aliases) {
if (i >= aliases_nodes)
p = NULL;
else
@@ -115,7 +116,7 @@ static ssize_t property_read(struct file
return -EIO;
i = prom_getproplen (node, p);
if (i < 0) {
- if (PTR_NOD(inode->u.generic_ip) == aliases)
+ if (ptr_nod(inode->u.generic_ip) == aliases)
i = 0;
else
return -EIO;
@@ -544,8 +545,8 @@ int property_release (struct inode *inod
if (!op)
return 0;
lock_kernel();
- node = nodes[PTR_NOD(inode->u.generic_ip)].node;
- if (PTR_NOD(inode->u.generic_ip) == aliases) {
+ node = nodes[ptr_nod(inode->u.generic_ip)].node;
+ if (ptr_nod(inode->u.generic_ip) == aliases) {
if ((op->flag & OPP_DIRTY) && (op->flag & OPP_STRING)) {
char *p = op->name;
int i = (op->value - op->name) - strlen (op->name) - 1;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
disable-debugging-version-of-write_lock.patch
rewritten-backlight-infrastructure-for-portable-apple-computers.patch
ufs-printk-warning-fixes.patch
msnd-section-fix.patch
openpromfs-factorize-out.patch
openpromfs-factorize-out-tidy.patch
add-driver-for-arm-amba-pl031-rtc-fix.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
load_module-cleanup.patch
ax88796-parallel-port-driver-build-fix.patch
for_each_cpu_mask-warning-fix.patch
add-max6902-rtc-support-tidy.patch
add-v3020-rtc-support-tidy.patch
at91rm9200-rtc-driver-tidy.patch
rtc-add-rtc-ds1553-driver-tidy.patch
rtc-add-rtc-ds1553-driver-fix.patch
rtc-add-rtc-ds1742-driver-tidy.patch
rtc-add-rtc-ds1742-driver-fix.patch
readahead-backoff-on-i-o-error-tweaks.patch
cyclades-cleanup-cleanup.patch
fuse-add-control-filesystem-get_sb_single-fix.patch
fuse-add-control-filesystem-printk-fix.patch
kthread-update-loopc-to-use-kthread-fix.patch
kthread-convert-smbiod-tidy.patch
kthread-convert-stop_machine-into-a-kthread.patch
fix-bounds-check-in-vsnprintf-to-allow-for-a-0-size-and-tidy.patch
irda-usb-printk-fix.patch
add-receive_room-flow-control-to-flush_to_ldisc-tidy.patch
reiserfs-on-demand-bitmap-loading-fix.patch
cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only-fix-fix.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
add-bcm43xx-hw-rng-support-locking-update.patch
hangcheck-remove-monotomic_clock-on-x86.patch
sched-fix-smt-nice-lock-contention-and-optimization-tidy.patch
swap_prefetch-vs-zoned-counters.patch
pi-futex-rt-mutex-tester-fix.patch
rtmutex-propagate-priority-settings-into-pi-lock-chains-fix.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
ipc-namespace-core-fix.patch
task-watchers-task-watchers-tidy.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.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
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-support-tidy.patch
imacfb-add-intel-based-macintosh-framebuffer-support-tidy.patch
vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch
genirq-ia64-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
