Skip to contentSkip to conversation

xfs: for-next branch updated to 4a91310

ANNOUNCE In review Dave Chinner 3 participants 5 messages Feb 8, 2016 – Feb 9, 2016 XFS filesystem

lore
Share & tools
lore
#0 lore raw

Hi folks,

The for-next branch of the xfs kernel repository at

git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git

has just been updated. I've pushed this out with both generic quota and direct Io modifications in it, so if they end up going into another tree expect a rebase of the for-next branch to occur to pull them in from the appropriate trees.

There is still a lot of changes pending review to go into this for-next tree, and I'm hoping to get the first part of the rmap/reflink work into it as well, so there's plenty of work still to be done in this cycle....

The new head of the for-next branch is commit:

4a91310 Merge branch 'xfs-misc-fixes-4.6' into for-next

New Commits:

Brian Foster (2):
[60630fe] xfs: clean up unwritten buffers on write failure [af055e3] xfs: fix xfs_log_ticket leak in xfs_end_io() after fs shutdown

Carlos Maiolino (1):
[be60794] xfs: Split default quota limits by quota type

Christoph Hellwig (6):
[187372a] direct-io: always call ->end_io if non-NULL [273dda7] xfs: don't use ioends for direct write completions [c19b104] xfs: fold xfs_vm_do_dio into xfs_vm_direct_IO [196328e] xfs: handle errors from ->free_blocks in xfs_btree_kill_iroot [c46ee8a] xfs: factor btree block freeing into a helper [edfd9dd] xfs: move buffer invalidation to xfs_btree_free_block

Darrick J. Wong (2):
[8e0bd49] xfs: fix endianness error when checking log block crc on big endian platforms [244efea] xfs: move struct xfs_attr_shortform to xfs_da_format.h

Dave Chinner (7):

      [4b680af] xfs: lock rt summary inode on allocation
      [a204d07] xfs: RT bitmap and summary buffers are not typed
      [ca4de5c] xfs: RT bitmap and summary buffers need verifiers
      [e892a10] Merge branch 'xfs-rt-fixes-4.6' into for-next
      [ec370f5] Merge branch 'xfs-get-next-dquot-4.6' into for-next
      [0d077b8] Merge branch 'xfs-dio-fix-4.6' into for-next
      [4a91310] Merge branch 'xfs-misc-fixes-4.6' into for-next

Eric Sandeen (8):
[3218a3e] quota: remove unused cmd argument from quota_quotaon() [8b37524] quota: add new quotactl Q_XGETNEXTQUOTA [926132c] quota: add new quotactl Q_GETNEXTQUOTA [a484bcd] xfs: don't overflow quota ID when initializing dqblk [4d4d952] xfs: get quota inode from mp & flags rather than dqp [8aa7d37] xfs: Factor xfs_seek_hole_data into helper [296c24e] xfs: wire up Q_XGETNEXTQUOTA / get_nextdqblk [de0b85a] xfs: remove unused function definitions

Michal Hocko (1):
[18f1df4] xfs: Make xfsaild freezeable again

Code Diffstat:

 fs/dax.c                         |   9 +-
 fs/direct-io.c                   |   9 +-
 fs/ext4/inode.c                  |   9 +-
 fs/ocfs2/aops.c                  |   7 +-
 fs/quota/quota.c                 |  66 +++++++++-
 fs/xfs/libxfs/xfs_alloc_btree.c  |   2 -
 fs/xfs/libxfs/xfs_attr_sf.h      |  16 ---
 fs/xfs/libxfs/xfs_bmap_btree.c   |   1 -
 fs/xfs/libxfs/xfs_btree.c        |  32 +++--
 fs/xfs/libxfs/xfs_da_format.h    |  16 +++
 fs/xfs/libxfs/xfs_ialloc_btree.c |  12 +-
 fs/xfs/libxfs/xfs_inode_fork.c   |   1 +
 fs/xfs/libxfs/xfs_log_format.h   |   2 +
 fs/xfs/libxfs/xfs_quota_defs.h   |   3 +-
 fs/xfs/libxfs/xfs_rtbitmap.c     |  30 ++++-
 fs/xfs/libxfs/xfs_sb.h           |   1 -
 fs/xfs/libxfs/xfs_shared.h       |   1 +
 fs/xfs/xfs_aops.c                | 274 +++++++++++++++------------------------
 fs/xfs/xfs_bmap_util.c           |   4 +-
 fs/xfs/xfs_dquot.c               | 129 +++++++++++++++---
 fs/xfs/xfs_file.c                |  82 ++++++++----
 fs/xfs/xfs_fsops.h               |   1 -
 fs/xfs/xfs_inode.h               |   2 +
 fs/xfs/xfs_log_recover.c         |   9 +-
 fs/xfs/xfs_mount.h               |   1 -
 fs/xfs/xfs_qm.c                  |  55 ++++++--
 fs/xfs/xfs_qm.h                  |  48 +++++--
 fs/xfs/xfs_qm_syscalls.c         |  27 ++--
 fs/xfs/xfs_quotaops.c            |  36 ++++-
 fs/xfs/xfs_trace.h               |   9 +-
 fs/xfs/xfs_trans_ail.c           |   5 +-
 fs/xfs/xfs_trans_dquot.c         |  15 ++-
 include/linux/fs.h               |   2 +-
 include/linux/quota.h            |   2 +
 include/uapi/linux/dqblk_xfs.h   |   1 +
 include/uapi/linux/quota.h       |  14 ++
 36 files changed, 615 insertions(+), 318 deletions(-)
Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#1 lore raw
Quoted 37 lines · Dave Chinner

Hi folks,

The for-next branch of the xfs kernel repository at

git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git

has just been updated. I've pushed this out with both generic quota and direct Io modifications in it, so if they end up going into another tree expect a rebase of the for-next branch to occur to pull them in from the appropriate trees.

There is still a lot of changes pending review to go into this for-next tree, and I'm hoping to get the first part of the rmap/reflink work into it as well, so there's plenty of work still to be done in this cycle....

The new head of the for-next branch is commit:

4a91310 Merge branch 'xfs-misc-fixes-4.6' into for-next

New Commits:

Brian Foster (2):
[60630fe] xfs: clean up unwritten buffers on write failure [af055e3] xfs: fix xfs_log_ticket leak in xfs_end_io() after fs shutdown

Carlos Maiolino (1):
[be60794] xfs: Split default quota limits by quota type

Christoph Hellwig (6):
[187372a] direct-io: always call ->end_io if non-NULL [273dda7] xfs: don't use ioends for direct write completions [c19b104] xfs: fold xfs_vm_do_dio into xfs_vm_direct_IO [196328e] xfs: handle errors from ->free_blocks in xfs_btree_kill_iroot [c46ee8a] xfs: factor btree block freeing into a helper [edfd9dd] xfs: move buffer invalidation to xfs_btree_free_block

Quoted 8 lines

Darrick J. Wong (2):
[8e0bd49] xfs: fix endianness error when checking log block crc on big endian platforms [244efea] xfs: move struct xfs_attr_shortform to xfs_da_format.h

Dave Chinner (7):
[4b680af] xfs: lock rt summary inode on allocation [a204d07] xfs: RT bitmap and summary buffers are not typed [ca4de5c] xfs: RT bitmap and summary buffers need verifiers

FYI, this one ^ leads to compile failures when CONFIG_XFS_RT is not enabled. xfs_rtbuf_ops is defined in the conditionally compiled xfs_rtbitmap.c file and used unconditionally in xfs_log_recover.c.

Brian

Quoted 50 lines
      [e892a10] Merge branch 'xfs-rt-fixes-4.6' into for-next
      [ec370f5] Merge branch 'xfs-get-next-dquot-4.6' into for-next
      [0d077b8] Merge branch 'xfs-dio-fix-4.6' into for-next
      [4a91310] Merge branch 'xfs-misc-fixes-4.6' into for-next

Eric Sandeen (8):
[3218a3e] quota: remove unused cmd argument from quota_quotaon() [8b37524] quota: add new quotactl Q_XGETNEXTQUOTA [926132c] quota: add new quotactl Q_GETNEXTQUOTA [a484bcd] xfs: don't overflow quota ID when initializing dqblk [4d4d952] xfs: get quota inode from mp & flags rather than dqp [8aa7d37] xfs: Factor xfs_seek_hole_data into helper [296c24e] xfs: wire up Q_XGETNEXTQUOTA / get_nextdqblk [de0b85a] xfs: remove unused function definitions

Michal Hocko (1):
[18f1df4] xfs: Make xfsaild freezeable again

Code Diffstat:

 fs/dax.c                         |   9 +-
 fs/direct-io.c                   |   9 +-
 fs/ext4/inode.c                  |   9 +-
 fs/ocfs2/aops.c                  |   7 +-
 fs/quota/quota.c                 |  66 +++++++++-
 fs/xfs/libxfs/xfs_alloc_btree.c  |   2 -
 fs/xfs/libxfs/xfs_attr_sf.h      |  16 ---
 fs/xfs/libxfs/xfs_bmap_btree.c   |   1 -
 fs/xfs/libxfs/xfs_btree.c        |  32 +++--
 fs/xfs/libxfs/xfs_da_format.h    |  16 +++
 fs/xfs/libxfs/xfs_ialloc_btree.c |  12 +-
 fs/xfs/libxfs/xfs_inode_fork.c   |   1 +
 fs/xfs/libxfs/xfs_log_format.h   |   2 +
 fs/xfs/libxfs/xfs_quota_defs.h   |   3 +-
 fs/xfs/libxfs/xfs_rtbitmap.c     |  30 ++++-
 fs/xfs/libxfs/xfs_sb.h           |   1 -
 fs/xfs/libxfs/xfs_shared.h       |   1 +
 fs/xfs/xfs_aops.c                | 274 +++++++++++++++------------------------
 fs/xfs/xfs_bmap_util.c           |   4 +-
 fs/xfs/xfs_dquot.c               | 129 +++++++++++++++---
 fs/xfs/xfs_file.c                |  82 ++++++++----
 fs/xfs/xfs_fsops.h               |   1 -
 fs/xfs/xfs_inode.h               |   2 +
 fs/xfs/xfs_log_recover.c         |   9 +-
 fs/xfs/xfs_mount.h               |   1 -
 fs/xfs/xfs_qm.c                  |  55 ++++++--
 fs/xfs/xfs_qm.h                  |  48 +++++--
 fs/xfs/xfs_qm_syscalls.c         |  27 ++--
 fs/xfs/xfs_quotaops.c            |  36 ++++-
Quoted 16 lines
 fs/xfs/xfs_trace.h               |   9 +-
 fs/xfs/xfs_trans_ail.c           |   5 +-
 fs/xfs/xfs_trans_dquot.c         |  15 ++-
 include/linux/fs.h               |   2 +-
 include/linux/quota.h            |   2 +
 include/uapi/linux/dqblk_xfs.h   |   1 +
 include/uapi/linux/quota.h       |  14 ++
 36 files changed, 615 insertions(+), 318 deletions(-)
Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 42 lines · Brian Foster
Quoted 41 lines · Dave Chinner

Hi folks,

The for-next branch of the xfs kernel repository at

git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git

has just been updated. I've pushed this out with both generic quota and direct Io modifications in it, so if they end up going into another tree expect a rebase of the for-next branch to occur to pull them in from the appropriate trees.

There is still a lot of changes pending review to go into this for-next tree, and I'm hoping to get the first part of the rmap/reflink work into it as well, so there's plenty of work still to be done in this cycle....

The new head of the for-next branch is commit:

4a91310 Merge branch 'xfs-misc-fixes-4.6' into for-next

New Commits:

Brian Foster (2):
[60630fe] xfs: clean up unwritten buffers on write failure [af055e3] xfs: fix xfs_log_ticket leak in xfs_end_io() after fs shutdown

Carlos Maiolino (1):
[be60794] xfs: Split default quota limits by quota type

Christoph Hellwig (6):
[187372a] direct-io: always call ->end_io if non-NULL [273dda7] xfs: don't use ioends for direct write completions [c19b104] xfs: fold xfs_vm_do_dio into xfs_vm_direct_IO [196328e] xfs: handle errors from ->free_blocks in xfs_btree_kill_iroot [c46ee8a] xfs: factor btree block freeing into a helper [edfd9dd] xfs: move buffer invalidation to xfs_btree_free_block

Darrick J. Wong (2):
[8e0bd49] xfs: fix endianness error when checking log block crc on big endian platforms [244efea] xfs: move struct xfs_attr_shortform to xfs_da_format.h

Quoted 8 lines
Quoted 4 lines

Dave Chinner (7):
[4b680af] xfs: lock rt summary inode on allocation [a204d07] xfs: RT bitmap and summary buffers are not typed [ca4de5c] xfs: RT bitmap and summary buffers need verifiers

FYI, this one ^ leads to compile failures when CONFIG_XFS_RT is not enabled. xfs_rtbuf_ops is defined in the conditionally compiled xfs_rtbitmap.c file and used unconditionally in xfs_log_recover.c.

Ah, ok. I didn't test that - there's way too many different ways to build kernels.... :/

I guess log recovery now needs #ifdef CONFIG_XFS_RT bits in it. I'll spin up a patch later today.

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#3 lore raw

PATCH 1/1 xfs: log recovery needs to be aware of CONFIG_XFS_RT now

From: Dave Chinner <[email protected]>

As it uses buffer verifiers that only exist when CONFIG_XFS_RT=y.

---
Note: I will fold this back into the original patch that caused this build regression and rebuild the for-next tree.

 fs/xfs/xfs_log_recover.c | 2 ++
 1 file changed, 2 insertions(+)
fs/xfs/xfs_log_recover.c +2 -0
index 23ad143..1dc0e14 100644
@@ -2472,11 +2472,13 @@ xlog_recover_validate_buf_type(
 		}
 		bp->b_ops = &xfs_sb_buf_ops;
 		break;
+#ifdef CONFIG_XFS_RT
 	case XFS_BLFT_RTBITMAP_BUF:
 	case XFS_BLFT_RTSUMMARY_BUF:
 		/* no magic numbers for verification of RT buffers */
 		bp->b_ops = &xfs_rtbuf_ops;
 		break;
+#endif /* CONFIG_XFS_RT */
 	default:
 		xfs_warn(mp, "Unknown buffer type %d!",
 			 xfs_blft_from_flags(buf_f));

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#4 lore raw

Re: [PATCH] xfs: log recovery needs to be aware of CONFIG_XFS_RT now

Quoted 5 lines · Dave Chinner

From: Dave Chinner <[email protected]>

As it uses buffer verifiers that only exist when CONFIG_XFS_RT=y.

Quoted 26 lines

---
Note: I will fold this back into the original patch that caused this build regression and rebuild the for-next tree.

 fs/xfs/xfs_log_recover.c | 2 ++
 1 file changed, 2 insertions(+)
fs/xfs/xfs_log_recover.c +2 -0
index 23ad143..1dc0e14 100644
@@ -2472,11 +2472,13 @@ xlog_recover_validate_buf_type(
 		}
 		bp->b_ops = &xfs_sb_buf_ops;
 		break;
+#ifdef CONFIG_XFS_RT
 	case XFS_BLFT_RTBITMAP_BUF:
 	case XFS_BLFT_RTSUMMARY_BUF:
 		/* no magic numbers for verification of RT buffers */
 		bp->b_ops = &xfs_rtbuf_ops;
 		break;
+#endif /* CONFIG_XFS_RT */
 	default:
 		xfs_warn(mp, "Unknown buffer type %d!",
 			 xfs_blft_from_flags(buf_f));
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs