projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[powerpc.git]
/
fs
/
xfs
/
xfs_vfsops.c
diff --git
a/fs/xfs/xfs_vfsops.c
b/fs/xfs/xfs_vfsops.c
index
6c96391
..
62336a4
100644
(file)
--- a/
fs/xfs/xfs_vfsops.c
+++ b/
fs/xfs/xfs_vfsops.c
@@
-515,7
+515,7
@@
xfs_mount(
if (error)
goto error2;
if (error)
goto error2;
- if (
(mp->m_flags & XFS_MOUNT_BARRIER) && !(vfsp->vfs_flag & VFS_RDONLY)
)
+ if (
mp->m_flags & XFS_MOUNT_BARRIER
)
xfs_mountfs_check_barriers(mp);
error = XFS_IOINIT(vfsp, args, flags);
xfs_mountfs_check_barriers(mp);
error = XFS_IOINIT(vfsp, args, flags);
@@
-811,7
+811,8
@@
xfs_statvfs(
statp->f_bsize = sbp->sb_blocksize;
lsize = sbp->sb_logstart ? sbp->sb_logblocks : 0;
statp->f_blocks = sbp->sb_dblocks - lsize;
statp->f_bsize = sbp->sb_blocksize;
lsize = sbp->sb_logstart ? sbp->sb_logblocks : 0;
statp->f_blocks = sbp->sb_dblocks - lsize;
- statp->f_bfree = statp->f_bavail = sbp->sb_fdblocks;
+ statp->f_bfree = statp->f_bavail =
+ sbp->sb_fdblocks - XFS_ALLOC_SET_ASIDE(mp);
fakeinos = statp->f_bfree << sbp->sb_inopblog;
#if XFS_BIG_INUMS
fakeinos += mp->m_inoadd;
fakeinos = statp->f_bfree << sbp->sb_inopblog;
#if XFS_BIG_INUMS
fakeinos += mp->m_inoadd;
@@
-1921,7
+1922,7
@@
xfs_showargs(
}
if (mp->m_flags & XFS_MOUNT_IHASHSIZE)
}
if (mp->m_flags & XFS_MOUNT_IHASHSIZE)
- seq_printf(m, "," MNTOPT_IHASHSIZE "=%d", mp->m_ihsize);
+ seq_printf(m, "," MNTOPT_IHASHSIZE "=%d",
(int)
mp->m_ihsize);
if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)
seq_printf(m, "," MNTOPT_ALLOCSIZE "=%dk",
if (mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)
seq_printf(m, "," MNTOPT_ALLOCSIZE "=%dk",