* [PATCH] ext4: include journal blocks in df overhead calcs
@ 2012-11-28 20:51 Eric Sandeen
2012-11-28 21:48 ` [PATCH V2] " Eric Sandeen
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2012-11-28 20:51 UTC (permalink / raw)
To: ext4 development
To more accurately calculate overhead for "bsd" style
df reporting, we should count the journal blocks as
overhead as well.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Tested-by: Eric Whitney <enwlinux@gmail.com>
---
I don't think this needs any special treatment for
big allocclusters, does it? df still reports
blocks?
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 80928f7..b441daa 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3229,6 +3229,10 @@ int ext4_calculate_overhead(struct super_block *sb)
memset(buf, 0, PAGE_SIZE);
cond_resched();
}
+ /* Add the journal blocks as well */
+ if (sbi->s_journal)
+ overhead += sbi->s_journal->j_maxlen;
+
sbi->s_overhead = overhead;
smp_wmb();
free_page((unsigned long) buf);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH V2] ext4: include journal blocks in df overhead calcs
2012-11-28 20:51 [PATCH] ext4: include journal blocks in df overhead calcs Eric Sandeen
@ 2012-11-28 21:48 ` Eric Sandeen
2012-12-25 18:57 ` Theodore Ts'o
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2012-11-28 21:48 UTC (permalink / raw)
To: ext4 development; +Cc: Eric Whitney
To more accurately calculate overhead for "bsd" style
df reporting, we should count the journal blocks as
overhead as well.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Tested-by: Eric Whitney <enwlinux@gmail.com>
---
V2: I guess s_overhead _is_ in clusters, so do
that conversion after all. Ted, if I'm wrong, you
can pick the other patch ;)
Editorial/soapbox:
TBH it's hard to keep track of what fields are
now stored as "clusters" not blocks . . .
Esp. when we do things like use local vars named "blk" -
blks = count_overhead(sb, i, buf);
but count_overhead() returns *clusters*, so it's
really quite confusing to keep it all straight.
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 80928f7..b441daa 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3229,6 +3229,10 @@ int ext4_calculate_overhead(struct super_block *sb)
memset(buf, 0, PAGE_SIZE);
cond_resched();
}
+ /* Add the journal blocks as well */
+ if (sbi->s_journal)
+ overhead += EXT4_B2C(sbi, sbi->s_journal->j_maxlen);
+
sbi->s_overhead = overhead;
smp_wmb();
free_page((unsigned long) buf);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] ext4: include journal blocks in df overhead calcs
2012-11-28 21:48 ` [PATCH V2] " Eric Sandeen
@ 2012-12-25 18:57 ` Theodore Ts'o
0 siblings, 0 replies; 3+ messages in thread
From: Theodore Ts'o @ 2012-12-25 18:57 UTC (permalink / raw)
To: Eric Sandeen; +Cc: ext4 development, Eric Whitney
On Wed, Nov 28, 2012 at 03:48:24PM -0600, Eric Sandeen wrote:
> To more accurately calculate overhead for "bsd" style
> df reporting, we should count the journal blocks as
> overhead as well.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> Tested-by: Eric Whitney <enwlinux@gmail.com>
Thanks, applied.
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-25 18:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-28 20:51 [PATCH] ext4: include journal blocks in df overhead calcs Eric Sandeen
2012-11-28 21:48 ` [PATCH V2] " Eric Sandeen
2012-12-25 18:57 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).