Skip to contentSkip to conversation

fs/jbd/journal.c: possible cleanups

RFC PATCH In review Adrian Bunk 5 participants 13 messages May 16, 2006 – May 18, 2006

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 fs/jbd/journal.c: possible cleanups

This patch contains the following possible cleanups:
- make the following needlessly global function static:
- journal_check_used_features()
- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

---

This patch was already sent on:
- 1 May 2006
- 23 Apr 2006

 fs/jbd/journal.c    |    9 ++++-----
 include/linux/jbd.h |    2 --
 2 files changed, 4 insertions(+), 7 deletions(-)
include/linux/jbd.h renamed from include/linux/jbd.h.old +0 -2
@@ -908,8 +908,6 @@
 				int start, int len, int bsize);
 extern journal_t * journal_init_inode (struct inode *);
 extern int	   journal_update_format (journal_t *);
-extern int	   journal_check_used_features 
-		   (journal_t *, unsigned long, unsigned long, unsigned long);
 extern int	   journal_check_available_features 
 		   (journal_t *, unsigned long, unsigned long, unsigned long);
 extern int	   journal_set_features 
fs/jbd/journal.c renamed from fs/jbd/journal.c.old +4 -5
@@ -62,13 +62,10 @@
 EXPORT_SYMBOL(journal_init_dev);
 EXPORT_SYMBOL(journal_init_inode);
 EXPORT_SYMBOL(journal_update_format);
-EXPORT_SYMBOL(journal_check_used_features);
 EXPORT_SYMBOL(journal_check_available_features);
-EXPORT_SYMBOL(journal_set_features);
 EXPORT_SYMBOL(journal_create);
 EXPORT_SYMBOL(journal_load);
 EXPORT_SYMBOL(journal_destroy);
-EXPORT_SYMBOL(journal_update_superblock);
 EXPORT_SYMBOL(journal_abort);
 EXPORT_SYMBOL(journal_errno);
 EXPORT_SYMBOL(journal_ack_err);
@@ -1169,8 +1166,10 @@
  * features.  Return true (non-zero) if it does. 
  **/
 
-int journal_check_used_features (journal_t *journal, unsigned long compat,
-				 unsigned long ro, unsigned long incompat)
+static int journal_check_used_features(journal_t *journal,
+				       unsigned long compat,
+				       unsigned long ro,
+				       unsigned long incompat)
 {
 	journal_superblock_t *sb;
 
#1 lore raw
Quoted 4 lines · Adrian Bunk

- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

These might be used by lustre - dunno.

But I'm ducking all patches which alter exports, as usual. If you can get them through the subsystem maintainer then good luck.

I'd suggest that we pursue the approach of getting the module loader to spit a warning when someone uses a going-away-soon export.

Arjan had a patch which did that, but he removed basically _every_ presently-unused export. I don't think we should do that. If we're exporting, for example, the kthread API and we happen to notice that kthread_bind() isn't presently used by any modules then I don't believe it makes much sense to unexport kthread_bind(). It makes more sense to export the kthread API as a whole.

#2 lore raw
Quoted 7 lines · Andrew Morton
Quoted 4 lines · Adrian Bunk

- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

These might be used by lustre - dunno.

I don't see this.

Quoted 3 lines

But I'm ducking all patches which alter exports, as usual. If you can get them through the subsystem maintainer then good luck.
...

Since you replied to this patch:
Who is the subsystem maintainer for jbd?

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw
Quoted 11 lines · Adrian Bunk
Quoted 7 lines · Andrew Morton
Quoted 4 lines · Adrian Bunk

- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

These might be used by lustre - dunno.

I don't see this.

Lustre doesn't use these?

Still, the jbd API is exported for other filesystems to use. If these functions are considered part of that API (they are) then I'd suggest that they should be exported.

Quoted 6 lines
Quoted 3 lines

But I'm ducking all patches which alter exports, as usual. If you can get them through the subsystem maintainer then good luck.
...

Since you replied to this patch:
Who is the subsystem maintainer for jbd?

A few people, including me..

#5 lore raw
In reply to Adrian Bunk
Quoted 2 lines · Adrian Bunk

Since you replied to this patch:
Who is the subsystem maintainer for jbd?

I'd suggest sending mail to [email protected]. There's actually a lot of work going on right now with both ext3 and jbd right now, including finally getting the 64-bit support for jbd merged in.

- Ted

#6 lore raw
Quoted 7 lines · Theodore Tso
Quoted 2 lines · Adrian Bunk

Since you replied to this patch:
Who is the subsystem maintainer for jbd?

I'd suggest sending mail to [email protected]. There's actually a lot of work going on right now with both ext3 and jbd right now, including finally getting the 64-bit support for jbd merged in.

What about getting a MAINTAINERS entry for jbd?

The only current entry listing [email protected] is for ext2 which doesn't use jbd...

Quoted 1 line

- Ted

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#7 lore raw

PATCH 1/1 Update ext2/ext3/jbd MAINTAINERS entries

Quoted 4 lines · Adrian Bunk

What about getting a MAINTAINERS entry for jbd?

The only current entry listing [email protected] is for ext2 which doesn't use jbd...

Ext2-devel is the list where all ext2/ext3/jbd development discussions have been happening. So it's a better list than [email protected], which is mainly for user questions/support.

MAINTAINERS +7 -1
index d6a8e5b..b24cf8b 100644
@@ -969,7 +969,7 @@ S:	Maintained
 EXT3 FILE SYSTEM
 P:	Stephen Tweedie, Andrew Morton
 M:	[email protected], [email protected], [email protected]
-L:	[email protected]
+L:	[email protected]
 S:	Maintained
 
 F71805F HARDWARE MONITORING DRIVER
@@ -1529,6 +1529,12 @@ W:	http://jfs.sourceforge.net/
 T:	git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
 S:	Supported
 
+JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
+P:	Stephen Tweedie, Andrew Morton
+M:	[email protected], [email protected]
+L:	[email protected]
+S:	Maintained
+
 KCONFIG
 P:	Roman Zippel
 M:	[email protected]
#9 lore raw
In reply to Andrew Morton
Quoted 8 lines · Andrew Morton
Quoted 4 lines · Adrian Bunk

- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

These might be used by lustre - dunno.

Quoted 8 lines

But I'm ducking all patches which alter exports, as usual. If you can get them through the subsystem maintainer then good luck.

I'd suggest that we pursue the approach of getting the module loader to spit a warning when someone uses a going-away-soon export.

Arjan had a patch which did that, but he removed basically _every_ presently-unused export.

NOT IN THE SAME PATCH!
I made the infrastructure a very nicely separate patch.... and I thought I explained that to you as well ;(

#10 lore raw
Quoted 13 lines · Arjan van de Ven
Quoted 11 lines · Andrew Morton
Quoted 4 lines · Adrian Bunk

- remove the following unused EXPORT_SYMBOL's:
- journal_set_features
- journal_update_superblock

These might be used by lustre - dunno.

But I'm ducking all patches which alter exports, as usual. If you can get them through the subsystem maintainer then good luck.

Quoted 7 lines
Quoted 5 lines

I'd suggest that we pursue the approach of getting the module loader to spit a warning when someone uses a going-away-soon export.

Arjan had a patch which did that, but he removed basically _every_ presently-unused export.

NOT IN THE SAME PATCH!

I noticed.

Quoted 2 lines

I made the infrastructure a very nicely separate patch.... and I thought I explained that to you as well ;(

You did. I was referring to the EXPORT_SYMBOL patches.

I don't think we should take the scattergun approach here. Get the infrastructure merged, then methodically work the EXPORT_SYMBOL patches with the various maintainers.

#11 lore raw
Quoted 3 lines

I don't think we should take the scattergun approach here. Get the infrastructure merged,

that should be relatively easy... would you mind doing it via your tree?

Quoted 2 lines

then methodically work the EXPORT_SYMBOL patches
with the various maintainers.

yep but that needs step 1 to happen or they won't / can't take them...

#12 lore raw
Quoted 6 lines · Arjan van de Ven
Quoted 4 lines

I don't think we should take the scattergun approach here. Get the infrastructure merged,

that should be relatively easy... would you mind doing it via your tree?

Sure.

#8 lore raw

Re: [PATCH] Update ext2/ext3/jbd MAINTAINERS entries

In reply to Theodore Tso

Hi,

Quoted 3 lines · Theodore Tso

Ext2-devel is the list where all ext2/ext3/jbd development discussions have been happening. So it's a better list than [email protected], which is mainly for user questions/support.

Right, looks fine to me.

--Stephen

#4 lore raw
In reply to Andrew Morton

Hi,

Quoted 3 lines · Andrew Morton

Still, the jbd API is exported for other filesystems to use. If these functions are considered part of that API (they are) then I'd suggest that they should be exported.

Agreed.

Note that on ext2-devel there has been a huge amount of activity over the past month to get extents, and >32-bit block addressing, ready for ext3. One of the things needed for that is a new jbd-level feature for 64-bit capability, so ext3 is going to need more dynamic access to the jbd feature bits soon. This is definitely not the right time to be removing feature access from the API!

--Stephen