On 07/19/2013 02:24 AM, Dave Chinner wrote:
> Hi folks,
>
> The following mass of patches is my current patch queue I have
> pending for the 3.12 cycle.
OK, it seems to be going okay: The PC is still functioning, even on
a CRC-enabled / partition. The `git am` session had these anomalies:
# Patch #5
Applying: xfs: separate dquot on disk format definitions out of xfs_quota.h
/usr/src/kernel-git/linux/.git/rebase-apply/patch:138: trailing whitespace.
* This header file defines all the on-disk format definitions for
warning: 1 line adds whitespace errors.
# Patch #15
Applying: xfs: move getdents code into it's own file
/usr/src/kernel-git/linux/.git/rebase-apply/patch:1266: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
########
There were build errors as well with gcc-4.8.1:
CC fs/xfs/xfs_inode_fork.o
fs/xfs/xfs_inode_fork.c:43:23: fatal error: xfs_utils.h: No such file or
directory
#include "xfs_utils.h"
^
compilation terminated.
make[2]: *** [fs/xfs/xfs_inode_fork.o] Error 1
make[1]: *** [fs/xfs] Error 2
make: *** [fs] Error 2
# next try...
CC fs/xfs/xfs_inode_fork.o
fs/xfs/xfs_inode_fork.c:49:26: fatal error: xfs_vnodeops.h: No such file or
directory
#include "xfs_vnodeops.h"
^
compilation terminated.
make[2]: *** [fs/xfs/xfs_inode_fork.o] Error 1
make[1]: *** [fs/xfs] Error 2
make: *** [fs] Error 2
########
Hopefully, I didn't leave a patch out. To get the code to build fully,
these patches were applied:
diff --git a/fs/xfs/xfs_inode_fork.c b/fs/xfs/xfs_inode_fork.c
index f06570b..123971b 100644
--- a/fs/xfs/xfs_inode_fork.c
+++ b/fs/xfs/xfs_inode_fork.c
@@ -40,10 +40,8 @@
#include "xfs_ialloc.h"
#include "xfs_bmap.h"
#include "xfs_error.h"
-#include "xfs_utils.h"
#include "xfs_quota.h"
#include "xfs_filestream.h"
-#include "xfs_vnodeops.h"
#include "xfs_cksum.h"
#include "xfs_trace.h"
#include "xfs_icache.h"
--
1.8.3.2
diff --git a/fs/xfs/xfs_log_rlimit.c b/fs/xfs/xfs_log_rlimit.c
index e3f4b4e..9224296 100644
--- a/fs/xfs/xfs_log_rlimit.c
+++ b/fs/xfs/xfs_log_rlimit.c
@@ -137,7 +137,8 @@ xfs_log_calc_minimum_size(
* it up to lsunit boundary if lsunit is specified.
*/
if (lsunit)
- min_logblks = roundup(BTOBB(max_logres), lsunit) + 2 * lsunit;
+ min_logblks = roundup((int)BTOBB(max_logres), lsunit)
+ + 2 * lsunit;
else
min_logblks = BTOBB(max_logres);
min_logblks *= XFS_MIN_LOG_FACTOR;
--
1.8.3.2
That's about all, so far. There's something going wrong with a 2k
non-CRC XFS filesystem that I should track before doing too much with
xfstests. The initial results on a 32-bit Pentium 4 looked promising.
Thanks!
Michael
|