]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
exofs: statfs blocks is sectors not FS blocks
authorBoaz Harrosh <bharrosh@panasas.com>
Mon, 2 Nov 2009 16:19:24 +0000 (18:19 +0200)
committerBoaz Harrosh <bharrosh@panasas.com>
Thu, 10 Dec 2009 07:59:21 +0000 (09:59 +0200)
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>
fs/exofs/super.c

index 920f0165edf31f0feb4daff0d85f827825557186..28add3eac0a4221a2b0e9bc15012c4b9e1b81cfc 100644 (file)
@@ -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;