From: "Theodore Ts'o" <tytso@mit.edu>
To: Linux Kernel Developers List <linux-kernel@vger.kernel.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Subject: [PATCH 20/49] ext4: Move fs/ext4/group.h into ext4.h
Date: Mon, 8 Jun 2009 15:22:38 -0400 [thread overview]
Message-ID: <1244488987-32564-21-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1244488987-32564-20-git-send-email-tytso@mit.edu>
Move the function prototypes in group.h into ext4.h so they are all
defined in one place.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/balloc.c | 1 -
fs/ext4/ext4.h | 17 +++++++++++++++++
fs/ext4/group.h | 29 -----------------------------
fs/ext4/ialloc.c | 1 -
fs/ext4/mballoc.h | 1 -
fs/ext4/resize.c | 1 -
fs/ext4/super.c | 1 -
7 files changed, 17 insertions(+), 34 deletions(-)
delete mode 100644 fs/ext4/group.h
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index a5ba039..92f557d 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -19,7 +19,6 @@
#include <linux/buffer_head.h>
#include "ext4.h"
#include "ext4_jbd2.h"
-#include "group.h"
#include "mballoc.h"
/*
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index d9c5251..5973f32 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1270,6 +1270,14 @@ extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
ext4_group_t block_group,
struct buffer_head ** bh);
extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);
+struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,
+ ext4_group_t block_group);
+extern unsigned ext4_init_block_bitmap(struct super_block *sb,
+ struct buffer_head *bh,
+ ext4_group_t group,
+ struct ext4_group_desc *desc);
+#define ext4_free_blocks_after_init(sb, group, desc) \
+ ext4_init_block_bitmap(sb, NULL, group, desc)
/* dir.c */
extern int ext4_check_dir_entry(const char *, struct inode *,
@@ -1294,6 +1302,11 @@ extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);
extern unsigned long ext4_count_free_inodes(struct super_block *);
extern unsigned long ext4_count_dirs(struct super_block *);
extern void ext4_check_inodes_bitmap(struct super_block *);
+extern unsigned ext4_init_inode_bitmap(struct super_block *sb,
+ struct buffer_head *bh,
+ ext4_group_t group,
+ struct ext4_group_desc *desc);
+extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
/* mballoc.c */
extern long ext4_mb_stats;
@@ -1417,6 +1430,10 @@ extern void ext4_used_dirs_set(struct super_block *sb,
struct ext4_group_desc *bg, __u32 count);
extern void ext4_itable_unused_set(struct super_block *sb,
struct ext4_group_desc *bg, __u32 count);
+extern __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 group,
+ struct ext4_group_desc *gdp);
+extern int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 group,
+ struct ext4_group_desc *gdp);
static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
{
diff --git a/fs/ext4/group.h b/fs/ext4/group.h
deleted file mode 100644
index c2c0a8d..0000000
--- a/fs/ext4/group.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * linux/fs/ext4/group.h
- *
- * Copyright (C) 2007 Cluster File Systems, Inc
- *
- * Author: Andreas Dilger <adilger@clusterfs.com>
- */
-
-#ifndef _LINUX_EXT4_GROUP_H
-#define _LINUX_EXT4_GROUP_H
-
-extern __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 group,
- struct ext4_group_desc *gdp);
-extern int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 group,
- struct ext4_group_desc *gdp);
-struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,
- ext4_group_t block_group);
-extern unsigned ext4_init_block_bitmap(struct super_block *sb,
- struct buffer_head *bh,
- ext4_group_t group,
- struct ext4_group_desc *desc);
-#define ext4_free_blocks_after_init(sb, group, desc) \
- ext4_init_block_bitmap(sb, NULL, group, desc)
-extern unsigned ext4_init_inode_bitmap(struct super_block *sb,
- struct buffer_head *bh,
- ext4_group_t group,
- struct ext4_group_desc *desc);
-extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
-#endif /* _LINUX_EXT4_GROUP_H */
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 55ba419..916d05c 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -27,7 +27,6 @@
#include "ext4_jbd2.h"
#include "xattr.h"
#include "acl.h"
-#include "group.h"
/*
* ialloc.c contains the inodes allocation and deallocation routines
diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h
index dd9e6cd..75e34f6 100644
--- a/fs/ext4/mballoc.h
+++ b/fs/ext4/mballoc.h
@@ -23,7 +23,6 @@
#include <linux/mutex.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-#include "group.h"
/*
* with AGGRESSIVE_CHECK allocator runs consistency checks over
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index e8ded13..27eb289 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -15,7 +15,6 @@
#include <linux/slab.h>
#include "ext4_jbd2.h"
-#include "group.h"
#define outside(b, first, last) ((b) < (first) || (b) >= (last))
#define inside(b, first, last) ((b) >= (first) && (b) < (last))
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index d79e1c4..7903f20 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -46,7 +46,6 @@
#include "ext4_jbd2.h"
#include "xattr.h"
#include "acl.h"
-#include "group.h"
struct proc_dir_entry *ext4_proc_root;
static struct kset *ext4_kset;
--
1.6.3.2.1.gb9f7d.dirty
next prev parent reply other threads:[~2009-06-08 19:33 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-08 19:22 [PATCH 00/49] Ext4 patches currently queued for mainline Theodore Ts'o
2009-06-08 19:22 ` [PATCH 01/49] ext4: Properly initialize the buffer_head state Theodore Ts'o
2009-06-08 19:22 ` [PATCH 02/49] vfs: Add BUG_ON for delayed and unwritten flags in submit_bh() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 03/49] ext4: Mark the unwritten buffer_head as mapped during write_begin Theodore Ts'o
2009-06-08 19:22 ` [PATCH 04/49] ext4: Fallback to vmalloc if kmalloc can't allocate s_flex_groups array Theodore Ts'o
2009-06-08 19:22 ` [PATCH 05/49] ext4: Use is_power_of_2() for clarity Theodore Ts'o
2009-06-08 19:22 ` [PATCH 06/49] ext3: avoid unnecessary spinlock in critical POSIX ACL path Theodore Ts'o
2009-06-08 19:22 ` [PATCH 07/49] ext4: " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 08/49] ext4: Simplify ext4_commit_super()'s function signature Theodore Ts'o
2009-06-08 19:22 ` [PATCH 09/49] ext4: Fix and simplify s_dirt handling Theodore Ts'o
2009-06-08 19:22 ` [PATCH 10/49] ext4: Use separate super_operations structure for no_journal filesystems Theodore Ts'o
2009-06-08 19:22 ` [PATCH 11/49] ext4: Avoid races caused by on-line resizing and SMP memory reordering Theodore Ts'o
2009-06-08 19:22 ` [PATCH 12/49] ext4: Remove outdated comment about lock_super() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 13/49] ext4: ext4_mark_recovery_complete() doesn't need to use lock_super Theodore Ts'o
2009-06-08 19:22 ` [PATCH 14/49] ext4: Replace lock/unlock_super() with an explicit lock for the orphan list Theodore Ts'o
2009-06-08 19:22 ` [PATCH 15/49] ext4: Replace lock/unlock_super() with an explicit lock for resizing Theodore Ts'o
2009-06-08 19:22 ` [PATCH 16/49] ext4: Don't avoid using BLOCK_UNINIT block groups in mballoc Theodore Ts'o
2009-06-08 19:22 ` [PATCH 17/49] ext4: Move the ext4_i.h header file into ext4.h Theodore Ts'o
2009-06-08 19:22 ` [PATCH 18/49] ext4: Move the ext4_sb.h " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 19/49] ext4: Move fs/ext4/namei.h " Theodore Ts'o
2009-06-08 19:22 ` Theodore Ts'o [this message]
2009-06-08 19:22 ` [PATCH 21/49] ext4: Make the length of the mb_history file tunable Theodore Ts'o
2009-06-08 19:22 ` [PATCH 22/49] ext4: hook fiemap operation for directories Theodore Ts'o
2009-06-08 19:22 ` [PATCH 23/49] vfs: Enable FS_IOC_FIEMAP and FIGETBSZ for all filetypes Theodore Ts'o
2009-06-08 19:22 ` [PATCH 24/49] ext4: fix for fiemap last-block test Theodore Ts'o
2009-06-08 19:22 ` [PATCH 25/49] ext4: fix the length returned by fiemap for an unallocated extent Theodore Ts'o
2009-06-08 19:22 ` [PATCH 26/49] ext4: Convert ext4_lock_group to use sb_bgl_lock Theodore Ts'o
2009-06-08 19:22 ` [PATCH 27/49] ext4: Fix spinlock assertions on UP systems Theodore Ts'o
2009-06-08 19:22 ` [PATCH 28/49] ext4: Simplify function signature for ext4_da_get_block_write() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 29/49] ext4: Rename ext4_get_blocks_handle() to be ext4_ind_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 30/49] ext4: Rename ext4_get_blocks_wrap() to be ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 31/49] ext4: Define a new set of flags for ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 32/49] ext4: Add documentation to the ext4_*get_block* functions Theodore Ts'o
2009-06-08 19:22 ` [PATCH 33/49] ext4: Add BUG_ON debugging checks to noalloc_get_block_write() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 34/49] ext4: Merge ext4_da_get_block_write() into mpage_da_map_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 35/49] ext4: Clean up ext4_get_blocks() so it does not depend on bh_result->b_state Theodore Ts'o
2009-06-08 19:22 ` [PATCH 36/49] ext4: Add a comprehensive block validity check to ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 37/49] ext4: down i_data_sem only for read when walking tree for fiemap Theodore Ts'o
2009-06-08 19:22 ` [PATCH 38/49] ext4: Fix memory leak in ext4_fill_super() in case of a failed mount Theodore Ts'o
2009-06-08 19:22 ` [PATCH 39/49] ext3: Fix memory leak in ext3_fill_super() " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 40/49] ext2: Fix memory leak in ext2_fill_super() " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 41/49] ext4: remove unused function __ext4_write_dirty_metadata Theodore Ts'o
2009-06-08 19:23 ` [PATCH 42/49] ext4: Clean up calls to ext4_get_group_desc() Theodore Ts'o
2009-06-08 19:23 ` [PATCH 43/49] jbd2: Fix minor typos in comments in fs/jbd2/journal.c Theodore Ts'o
2009-06-08 19:23 ` [PATCH 44/49] ext4: super.c whitespace cleanup Theodore Ts'o
2009-06-08 19:23 ` [PATCH 45/49] ext4: Get rid of EXTEND_DISKSIZE flag of ext4_get_blocks_handle() Theodore Ts'o
2009-06-08 19:23 ` [PATCH 46/49] ext4: Change all super.c messages to print the device Theodore Ts'o
2009-06-08 19:23 ` [PATCH 47/49] ext4: Avoid leaking blocks after a block allocation failure Theodore Ts'o
2009-06-08 19:23 ` [PATCH 48/49] ext4: truncate the file properly if we fail to copy data from userspace Theodore Ts'o
2009-06-08 19:23 ` [PATCH 49/49] ext4: fix dx_map_entry to support 256k directory blocks Theodore Ts'o
2009-06-08 19:41 ` [PATCH 43/49] jbd2: Fix minor typos in comments in fs/jbd2/journal.c Alberto Bertogli
2009-06-09 4:06 ` Theodore Tso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1244488987-32564-21-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®