Linus Torvalds
8b306a2e7c
Various bugfixes, a RDMA update from Chuck Lever, and support for a new ...
pnfs layout type from Christoph Hellwig. The new layout type is a
variant of the block layout which uses SCSI features to offer improved
fencing and device identification.
Note this pull request also includes the client side of SCSI layout,
with Trond's permission.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW9D0/AAoJECebzXlCjuG+fYcP/ibluAOSRrQ523gQcJNS+QSV
3B7YY6diJkfQNkm4oAROwPd1KHT2qhoVAO3JHXA3SZnjVVYQxAHeh2wsZJ2jL6Ft
uyZARxix+F9alJVT3S+uYLwagjh9LXLhb0MaRTMheaWGsPKLQTU4JtsLsjAIhCah
R0EIIdQfWcb83XoVPmiflVO4Nl/TQWmfA5wHfoVtITJcL3AaC9gzCGNbc8dHLnFC
HRjGVgHr3nSL3suvUEFfxSEo4QoNPWIX4kBaWXgqbVgOQqmbtQtaXdnd3gIRtkzj
9Q/lxiwaArtDjdAQdyNtRRBUpkpWo+xWp/vpnNUxTXKoRtpSyqYQX5FaPCPRVAAp
GYGw2qHrvWn2hSajtVtKyWwsQ3lYsDmbkxAkgScO9kQdS+kuxNyIzYIEvakdtFyJ
txFsauJczkNNFeHKzLPDoGbuX7KB/+pUsjmX5nYtMhwRriXA5S8zcO4AvTrmTPDF
vQrLM97mqI60LWmpQUO1OE8CEFPVx5DUZ0KdLMvFNKPZph8BTPJxJMmxJK4R6stV
/TWglRTEO8IGUh0ww8+3PfMfxVG5XHnQc99+VGVZOS9hJ4GOXbWYAqZ0m+sRJ2Pi
JPawILie5x2gH1FrVYbcTZsQzdmdn/BF9yePNzAkMucjuEUHXFTlf3MMfEhKpYTl
0l8LBCv6ZvtGU+PUJxZn
=MToz
-----END PGP SIGNATURE-----
Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux
Pull more nfsd updates from Bruce Fields:
"Apologies for the previous request, which omitted the top 8 commits
from my for-next branch (including the SCSI layout commits). Thanks
to Trond for spotting my error!"
This actually includes the new layout types, so here's that part of
the pull message repeated:
"Support for a new pnfs layout type from Christoph Hellwig. The new
layout type is a variant of the block layout which uses SCSI features
to offer improved fencing and device identification.
Note this pull request also includes the client side of SCSI layout,
with Trond's permission"
* tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux:
nfsd: use short read as well as i_size to set eof
nfsd: better layoutupdate bounds-checking
nfsd: block and scsi layout drivers need to depend on CONFIG_BLOCK
nfsd: add SCSI layout support
nfsd: move some blocklayout code
nfsd: add a new config option for the block layout driver
nfs/blocklayout: add SCSI layout support
nfs4.h: add SCSI layout definitions
2016-03-24 19:50:32 -07:00
Merge branch 'xfs-misc-fixes-4.6-4' into for-next
2016-03-15 11:44:35 +11:00
xfs: more info from kmem deadlocks and high-level error msgs
2015-10-12 16:04:45 +11:00
kmemcg: account certain kmem allocations to memcg
2016-01-14 16:00:49 -08:00
nfsd: add SCSI layout support
2016-03-18 11:42:53 -04:00
xfs: Change how listxattr generates synthetic attributes
2015-12-06 21:34:16 -05:00
xfs: Change how listxattr generates synthetic attributes
2015-12-06 21:34:16 -05:00
xfs: Changes for 4.6-rc1
2016-03-21 11:53:05 -07:00
xfs: Changes for 4.6-rc1
2016-03-21 11:53:05 -07:00
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
2015-06-23 08:49:01 +10:00
xfs: fix two memory leaks in xfs_attr_list.c error paths
2016-03-02 09:51:09 +11:00
xfs: Changes for 4.6-rc1
2016-03-21 11:53:05 -07:00
xfs: remove XBF_DONE flag wrapper macros
2016-02-10 15:01:11 +11:00
xfs: remove XFS_BUF_ZEROFLAGS macro
2016-02-10 15:01:30 +11:00
xfs: remove XBF_STALE flag wrapper macros
2016-02-10 15:01:11 +11:00
xfs: fix non-debug build warnings
2015-08-25 10:05:13 +10:00
xfs: mode di_mode to vfs inode
2016-02-09 16:54:58 +11:00
xfs: fix format specifier , should be %llx and not %llu
2016-03-02 09:57:04 +11:00
xfs: Split default quota limits by quota type
2016-02-08 11:27:55 +11:00
xfs: print name of verifier if it fails
2016-01-04 16:10:19 +11:00
xfs: remove inst_t
2015-06-22 09:44:02 +10:00
Various bugfixes, a RDMA update from Chuck Lever, and support for a new
2016-03-24 19:50:32 -07:00
xfs: add helper to conditionally remove items from the AIL
2015-08-19 10:01:08 +10:00
xfs: fix efi/efd error handling to avoid fs shutdown hangs
2015-08-19 09:51:16 +10:00
Merge branch 'xfs-gut-icdinode-4.6' into for-next
2016-03-07 09:30:32 +11:00
xfs: mode di_mode to vfs inode
2016-02-09 16:54:58 +11:00
xfs: growfs not aware of sb_meta_uuid
2015-08-19 10:31:41 +10:00
xfs: remove unused function definitions
2016-02-08 14:58:07 +11:00
xfs: mode di_mode to vfs inode
2016-02-09 16:54:58 +11:00
Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next
2016-03-07 09:31:00 +11:00
Merge branch 'xfs-gut-icdinode-4.6' into for-next
2016-03-07 09:30:32 +11:00
xfs: mode di_mode to vfs inode
2016-02-09 16:54:58 +11:00
xfs: remove timestamps from incore inode
2016-02-09 16:54:58 +11:00
Merge branch 'xfs-dax-fixes-4.6' into for-next
2016-03-07 09:34:31 +11:00
xfs: prefix XATTR_LIST_MAX with XFS_
2015-10-12 16:02:56 +11:00
Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next
2016-01-12 07:04:30 +11:00
Merge branch 'xfs-dax-fixes-4.6' into for-next
2016-03-07 09:34:31 +11:00
xfs: mode di_mode to vfs inode
2016-02-09 16:54:58 +11:00
xfs: pass xfsstats structures to handlers and macros
2015-10-12 05:19:45 +11:00
xfs: use named array initializers for log item dumping
2016-03-07 08:40:03 +11:00
xfs: validate metadata LSNs against log on v5 superblocks
2015-10-12 15:59:25 +11:00
xfs: close xc_cil list_empty() races with cil commit sequence
2015-07-29 11:51:01 +10:00
xfs: debug mode log record crc error injection
2016-01-05 07:41:16 +11:00
xfs: fixes for 4.5-rc7
2016-03-11 10:21:32 -08:00
xfs: more info from kmem deadlocks and high-level error msgs
2015-10-12 16:04:45 +11:00
Merge branch 'xfs-misc-fixes-4.6-2' into for-next
2016-03-07 09:34:54 +11:00
Merge branch 'xfs-misc-fixes-4.6-4' into for-next
2016-03-15 11:44:35 +11:00
xfs: check sizes of XFS on-disk structures at compile time
2016-03-09 08:15:14 +11:00
wrappers for ->i_mutex access
2016-01-22 18:04:28 -05:00
nfsd: add SCSI layout support
2016-03-18 11:42:53 -04:00
xfs: Split default quota limits by quota type
2016-02-08 11:27:55 +11:00
xfs: Split default quota limits by quota type
2016-02-08 11:27:55 +11:00
xfs: Split default quota limits by quota type
2016-02-08 11:27:55 +11:00
xfs: fix quota block reservation leak when tp allocates and frees blocks
2015-06-01 07:15:37 +10:00
xfs: wire up Q_XGETNEXTQUOTA / get_nextdqblk
2016-02-08 11:27:38 +11:00
xfs: remove timestamps from incore inode
2016-02-09 16:54:58 +11:00
xfs: stats are no longer dependent on CONFIG_PROC_FS
2015-10-19 08:42:46 +11:00
xfs: per-filesystem stats counter implementation
2015-10-12 18:21:22 +11:00
Merge branch 'xfs-misc-fixes-4.6-3' into for-next
2016-03-09 08:18:30 +11:00
xfs: fix up inode32/64 (re)mount handling
2016-03-02 09:58:09 +11:00
xfs: eliminate committed arg from xfs_bmap_finish
2016-01-11 11:34:01 +11:00
xfs: pass xfsstats structures to handlers and macros
2015-10-12 05:19:45 +11:00
xfs: debug mode forced buffered write failure
2016-03-15 11:42:44 +11:00
xfs: create global stats and stats_clear in sysfs
2015-10-12 05:15:45 +11:00
xfs: don't use ioends for direct write completions
2016-02-08 14:40:51 +11:00
xfs: ensure committed is initialized in xfs_trans_roll
2016-03-15 11:42:47 +11:00
xfs: remove xfs_trans_get_block_res
2016-03-02 09:58:21 +11:00
xfs: Make xfsaild freezeable again
2016-02-08 14:59:07 +11:00
xfs: remove XBF_STALE flag wrapper macros
2016-02-10 15:01:11 +11:00
xfs: Split default quota limits by quota type
2016-02-08 11:27:55 +11:00
xfs: ensure EFD trans aborts on log recovery extent free failure
2015-08-19 09:51:43 +10:00
xfs: move di_changecount to VFS inode
2016-02-09 16:54:58 +11:00
xfs: add helper to conditionally remove items from the AIL
2015-08-19 10:01:08 +10:00
xfs: Change how listxattr generates synthetic attributes
2015-12-06 21:34:16 -05:00
8b306a2e7c