The patch titled
remove fs/ext2/balloc.c:reserve_blocks()
has been removed from the -mm tree. Its filename was
remove-fs-ext2-balloccreserve_blocks.patch
This patch was dropped because it was folded into ext2-reservations.patch
------------------------------------------------------
Subject: remove fs/ext2/balloc.c:reserve_blocks()
From: Adrian Bunk <bunk@xxxxxxxxxx>
reserve_blocks() is no longer used.
Spotted by the GNU C compiler.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx>
Cc: "Martin J. Bligh" <mbligh@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ext2/balloc.c | 35 -----------------------------------
1 file changed, 35 deletions(-)
diff -puN fs/ext2/balloc.c~remove-fs-ext2-balloccreserve_blocks fs/ext2/balloc.c
--- a/fs/ext2/balloc.c~remove-fs-ext2-balloccreserve_blocks
+++ a/fs/ext2/balloc.c
@@ -133,41 +133,6 @@ error_out:
return NULL;
}
-/*
- * Set sb->s_dirt here because the superblock was "logically" altered. We
- * need to recalculate its free blocks count and flush it out.
- */
-static int reserve_blocks(struct super_block *sb, int count)
-{
- struct ext2_sb_info *sbi = EXT2_SB(sb);
- struct ext2_super_block *es = sbi->s_es;
- unsigned free_blocks;
- unsigned root_blocks;
-
- free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
- root_blocks = le32_to_cpu(es->s_r_blocks_count);
-
- if (free_blocks < count)
- count = free_blocks;
-
- if (free_blocks < root_blocks + count && !capable(CAP_SYS_RESOURCE) &&
- sbi->s_resuid != current->fsuid &&
- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
- /*
- * We are too close to reserve and we are not privileged.
- * Can we allocate anything at all?
- */
- if (free_blocks > root_blocks)
- count = free_blocks - root_blocks;
- else
- return 0;
- }
-
- percpu_counter_sub(&sbi->s_freeblocks_counter, count);
- sb->s_dirt = 1;
- return count;
-}
-
static void release_blocks(struct super_block *sb, int count)
{
if (count) {
_
Patches currently in -mm which might be from bunk@xxxxxxxxxx are
origin.patch
kernel-time-timekeepingc-cleanups.patch
make-fs-libfscsimple_commit_write-static.patch
allow-disabling-dnotify-without-embedded.patch
use-erestart_restartblock-if-poll-is-interrupted-by-a-signal.patch
remove-include-asm-ipch.patch
n_hdlcc-fix-check-after-use.patch
kernel-sys_nic-add-dummy-sys_ni_syscall-prototype.patch
make-kernel-profilectime_hook-static.patch
drivers-block-ccissc-fix-check-after-use.patch
ext2-reservations.patch
remove-fs-ext2-balloccreserve_blocks.patch
bitmaph-remove-dead-artifacts.patch
sysctl-parport-remove-binary-paths-fix.patch
sysctl-error-on-bad-sysctl-tables-kernel-sysctl_checkc-must-include-linux-stringh.patch
memory-controller-add-per-container-lru-and-reclaim-v7-cleanup.patch
memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7-cleanup.patch
remove-asm-bitopsh-includes.patch
forbid-asm-bitopsh-direct-inclusion.patch
alpha-lock-bitops-fix.patch
reiser4-cryptcompress-misc-fixups-make-3-functions-static.patch
remove-asm-bitopsh-includes-reiser4.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
