The patch titled
ufs-right-block-allocation-fixes
has been added to the -mm tree. Its filename is
ufs-right-block-allocation-fixes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
- uninline ufs_clear_block() - it has two callsites
- coding cleanups
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ufs/inode.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff -puN fs/ufs/inode.c~ufs-right-block-allocation-fixes fs/ufs/inode.c
--- devel/fs/ufs/inode.c~ufs-right-block-allocation-fixes 2006-05-14 02:51:30.000000000 -0700
+++ devel-akpm/fs/ufs/inode.c 2006-05-14 02:51:30.000000000 -0700
@@ -161,7 +161,7 @@ out:
return ret;
}
-static inline void ufs_clear_block(struct inode *inode, struct buffer_head *bh)
+static void ufs_clear_block(struct inode *inode, struct buffer_head *bh)
{
lock_buffer(bh);
memset(bh->b_data, 0, inode->i_sb->s_blocksize);
@@ -172,7 +172,6 @@ static inline void ufs_clear_block(struc
sync_dirty_buffer(bh);
}
-
static struct buffer_head * ufs_inode_getfrag (struct inode *inode,
unsigned int fragment, unsigned int new_fragment,
unsigned int required, int *err, int metadata, long *phys, int *new)
@@ -216,7 +215,7 @@ repeat:
brelse (result);
goto repeat;
} else {
- *phys = tmp+blockoff;
+ *phys = tmp + blockoff;
return NULL;
}
}
@@ -275,7 +274,7 @@ repeat:
result = sb_getblk(inode->i_sb, tmp + blockoff);
ufs_clear_block(inode, result);
} else {
- *phys = tmp+blockoff;
+ *phys = tmp + blockoff;
result = NULL;
*err = 0;
*new = 1;
@@ -342,7 +341,7 @@ repeat:
brelse (result);
goto repeat;
} else {
- *phys = tmp+blockoff;
+ *phys = tmp + blockoff;
goto out;
}
}
@@ -363,7 +362,7 @@ repeat:
result = sb_getblk(sb, tmp + blockoff);
ufs_clear_block(inode, result);
} else {
- *phys = tmp+blockoff;
+ *phys = tmp + blockoff;
*new = 1;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
autofs4-nfy_none-wait-race-fix-tidy.patch
setup_per_zone_pages_min-overflow-fix.patch
revert-vfs-propagate-mnt_flags-into-do_loopback-vfsmount.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
s3c24xx-hardware-spi-driver-tidy.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
git-ieee1394.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-hdrcleanup-fixup.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
git-mtd.patch
git-mtd-isnt-arm-only.patch
git-netdev-all.patch
git-netdev-all-e1000-fixup.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
nfs-share-nfs-superblocks-per-protocol-per-server-per-fsid-fix.patch
fs-cache-release-page-private-in-failed-readahead-uninlining.patch
fs-cache-release-page-private-in-failed-readahead-uninlining-2.patch
nfs-use-local-caching-fix.patch
git-powerpc.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-watchdog.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
tracking-dirty-pages-in-shared-mappings-v4-fix2.patch
tracking-dirty-pages-in-shared-mappings-v4-fix3.patch
throttle-writers-of-shared-mappings-tidy.patch
acx1xx-wireless-driver.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
mark-address_space_operations-const-fix.patch
mark-address_space_operations-const-fix-2.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
ufs-right-block-allocation-fixes.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-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
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.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
