summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2009-11-02 18:19:24 +0200
committerBoaz Harrosh <bharrosh@panasas.com>2009-12-10 09:59:21 +0200
commitcae012d8532879544326fff5fa2ae22a6dfe8e23 (patch)
tree7958c2c11cee1b0c342f7902cd538dcec679989e
parent19fe294f2eaee33574ac1fdcf3cc26880de820ea (diff)
downloadlinux-3.10-cae012d8532879544326fff5fa2ae22a6dfe8e23.tar.gz
linux-3.10-cae012d8532879544326fff5fa2ae22a6dfe8e23.tar.bz2
linux-3.10-cae012d8532879544326fff5fa2ae22a6dfe8e23.zip
exofs: statfs blocks is sectors not FS blocks
Even though exofs has a 4k block size, statfs blocks is in sectors (512 bytes). Also if target returns 0 for capacity then make it ULLONG_MAX. df does not like zero-size filesystems Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
-rw-r--r--fs/exofs/super.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 920f0165edf..28add3eac0a 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -473,9 +473,11 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
goto out;
ret = extract_attr_from_req(or, &attrs[0]);
- if (likely(!ret))
+ if (likely(!ret)) {
capacity = get_unaligned_be64(attrs[0].val_ptr);
- else
+ if (unlikely(!capacity))
+ capacity = ULLONG_MAX;
+ } else
EXOFS_DBGMSG("exofs_statfs: get capacity failed.\n");
ret = extract_attr_from_req(or, &attrs[1]);
@@ -487,8 +489,8 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
/* fill in the stats buffer */
buf->f_type = EXOFS_SUPER_MAGIC;
buf->f_bsize = EXOFS_BLKSIZE;
- buf->f_blocks = (capacity >> EXOFS_BLKSHIFT);
- buf->f_bfree = ((capacity - used) >> EXOFS_BLKSHIFT);
+ buf->f_blocks = capacity >> 9;
+ buf->f_bfree = (capacity - used) >> 9;
buf->f_bavail = buf->f_bfree;
buf->f_files = sbi->s_numfiles;
buf->f_ffree = EXOFS_MAX_ID - sbi->s_numfiles;