| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1242323941-20541-2-git-send-email-tytso@mit.edu>
Date: Thu, 14 May 2009 13:59:01 -0400
From: Theodore Ts'o <tytso@....edu>
To: linux-ext4@...r.kernel.org
Cc: Theodore Ts'o <tytso@....edu>
Subject: [PATCH 2/2] patch use-separate-ext4_get_blocks_update_reserve_space_flag
---
fs/ext4/ext4.h | 15 +++++++++----
fs/ext4/inode.c | 56 ++++++++++++++++++++++++++++++------------------------
2 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index c2b3461..fca73f2 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -318,16 +318,21 @@ struct ext4_new_group_data {
*/
/* Allocate any needed blocks and/or convert an unitialized
extent to be an initialized ext4 */
-#define EXT4_GET_BLOCKS_CREATE 1
+#define EXT4_GET_BLOCKS_CREATE 0x0001
/* Request the creation of an unitialized extent */
-#define EXT4_GET_BLOCKS_UNINIT_EXT 2
+#define EXT4_GET_BLOCKS_UNINIT_EXT 0x0002
#define EXT4_GET_BLOCKS_CREATE_UNINIT_EXT (EXT4_GET_BLOCKS_UNINIT_EXT|\
EXT4_GET_BLOCKS_CREATE)
/* Update the ext4_inode_info i_disksize field */
-#define EXT4_GET_BLOCKS_EXTEND_DISKSIZE 4
+#define EXT4_GET_BLOCKS_EXTEND_DISKSIZE 0x0004
/* Caller is from the delayed allocation writeout path,
- so the filesystem blocks have already been accounted for */
-#define EXT4_GET_BLOCKS_DELALLOC_RESERVE 8
+ so set the magic i_delalloc_reserve_flag after taking the
+ inode allocation semaphore for */
+#define EXT4_GET_BLOCKS_DELALLOC_RESERVE 0x0008
+ /* Call ext4_da_update_reserve_space() after successfully
+ allocating the blocks */
+#define EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE 0x0010
+
/*
* ioctl commands
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index f7e5c48..e89beaa 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1270,16 +1270,15 @@ int ext4_get_blocks(handle_t *handle, struct inode *inode, sector_t block,
}
}
- if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) {
+ if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)
EXT4_I(inode)->i_delalloc_reserved_flag = 0;
- /*
- * Update reserved blocks/metadata blocks
- * after successful block allocation
- * which were deferred till now
- */
- if ((retval > 0) && buffer_delay(bh))
- ext4_da_update_reserve_space(inode, retval);
- }
+
+ /*
+ * Update reserved blocks/metadata blocks after successful
+ * block allocation which had been deferred till now.
+ */
+ if ((retval > 0) && (flags & EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE))
+ ext4_da_update_reserve_space(inode, retval);
up_write((&EXT4_I(inode)->i_data_sem));
if (retval > 0 && buffer_mapped(bh)) {
@@ -2057,7 +2056,7 @@ static void ext4_print_free_blocks(struct inode *inode)
*/
static int mpage_da_map_blocks(struct mpage_da_data *mpd)
{
- int err, blks;
+ int err, blks, get_blocks_flags;
struct buffer_head new;
sector_t next = mpd->b_blocknr;
unsigned max_blocks = mpd->b_size >> mpd->inode->i_blkbits;
@@ -2082,23 +2081,30 @@ static int mpage_da_map_blocks(struct mpage_da_data *mpd)
BUG_ON(!handle);
/*
- * We need to make sure the BH_Delay flag is passed down to
- * ext4_da_get_block_write(), since it calls ext4_get_blocks()
- * with the EXT4_GET_BLOCKS_DELALLOC_RESERVE flag. This flag
- * causes ext4_get_blocks() to call
- * ext4_da_update_reserve_space() if the passed buffer head
- * has the BH_Delay flag set. In the future, once we clean up
- * the interfaces to ext4_get_blocks(), we should pass in a
- * separate flag which requests that the delayed allocation
- * statistics should be updated, instead of depending on the
- * state information getting passed down via the map_bh's
- * state bitmasks plus the magic
- * EXT4_GET_BLOCKS_DELALLOC_RESERVE flag.
+ * Call ext4_get_blocks() to allocate any delayed allocation
+ * blocks, or to convert an uninitialized extent to be
+ * initialized (in the case where we have written into
+ * one or more preallocated blocks).
+ *
+ * We pass in the magic EXT4_GET_BLOCKS_DELALLOC_RESERVE to
+ * indicate that we are on the delayed allocation path. This
+ * affects functions in many different parts of the allocation
+ * call path. This flag exists primarily because we don't
+ * want to change *many* call functions, so ext4_get_blocks()
+ * will set the magic i_delalloc_reserved_flag once the
+ * inode's allocation semaphore is taken.
+ *
+ * If the blocks in questions were delalloc blocks, set
+ * EXT4_GET_BLOCKS_DELALLOC_RESERVE so the delalloc accounting
+ * variables are updated after the blocks have been allocated.
*/
- new.b_state = mpd->b_state & (1 << BH_Delay);
+ new.b_state = 0;
+ get_blocks_flags = (EXT4_GET_BLOCKS_CREATE |
+ EXT4_GET_BLOCKS_DELALLOC_RESERVE);
+ if (mpd->b_state & (1 << BH_Delay))
+ get_blocks_flags |= EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE;
blks = ext4_get_blocks(handle, mpd->inode, next, max_blocks,
- &new, EXT4_GET_BLOCKS_CREATE|
- EXT4_GET_BLOCKS_DELALLOC_RESERVE);
+ &new, get_blocks_flags);
if (blks < 0) {
err = blks;
/*
--
1.6.3.rc4.1.g3e14.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists