Skip to content

Commit 5cc60ae

Browse files
committed
Merge tag 'xfs-for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs
Pull xfs updates from Dave Chinner: "There is quite a varied bunch of stuff in this update, and some of it you will have already merged through the ext4 tree which imported the dax-4.10-iomap-pmd topic branch from the XFS tree. There is also a new direct IO implementation that uses the iomap infrastructure. It's much simpler, faster, and has lower IO latency than the existing direct IO infrastructure. Summary: - DAX PMD faults via iomap infrastructure - Direct-io support in iomap infrastructure - removal of now-redundant XFS inode iolock, replaced with VFS i_rwsem - synchronisation with fixes and changes in userspace libxfs code - extent tree lookup helpers - lots of little corruption detection improvements to verifiers - optimised CRC calculations - faster buffer cache lookups - deprecation of barrier/nobarrier mount options - we always use REQ_FUA/REQ_FLUSH where appropriate for data integrity now - cleanups to speculative preallocation - miscellaneous minor bug fixes and cleanups" * tag 'xfs-for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (63 commits) xfs: nuke unused tracepoint definitions xfs: use GPF_NOFS when allocating btree cursors xfs: use xfs_vn_setattr_size to check on new size xfs: deprecate barrier/nobarrier mount option xfs: Always flush caches when integrity is required xfs: ignore leaf attr ichdr.count in verifier during log replay xfs: use rhashtable to track buffer cache xfs: optimise CRC updates xfs: make xfs btree stats less huge xfs: don't cap maximum dedupe request length xfs: don't allow di_size with high bit set xfs: error out if trying to add attrs and anextents > 0 xfs: don't crash if reading a directory results in an unexpected hole xfs: complain if we don't get nextents bmap records xfs: check for bogus values in btree block headers xfs: forbid AG btrees with level == 0 xfs: several xattr functions can be void xfs: handle cow fork in xfs_bmap_trace_exlist xfs: pass state not whichfork to trace_xfs_extlist xfs: Move AGI buffer type setting to xfs_read_agi ...
2 parents 5c2992e + 9807b77 commit 5cc60ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1357
-1464
lines changed

Documentation/filesystems/xfs.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ default behaviour.
5151
CRC enabled filesystems always use the attr2 format, and so
5252
will reject the noattr2 mount option if it is set.
5353

54-
barrier (*)
55-
nobarrier
56-
Enables/disables the use of block layer write barriers for
57-
writes into the journal and for data integrity operations.
58-
This allows for drive level write caching to be enabled, for
59-
devices that support write barriers.
60-
6154
discard
6255
nodiscard (*)
6356
Enable/disable the issuing of commands to let the block
@@ -228,7 +221,10 @@ default behaviour.
228221
Deprecated Mount Options
229222
========================
230223

231-
None at present.
224+
Name Removal Schedule
225+
---- ----------------
226+
barrier no earlier than v4.15
227+
nobarrier no earlier than v4.15
232228

233229

234230
Removed Mount Options

fs/direct-io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ static inline int dio_bio_reap(struct dio *dio, struct dio_submit *sdio)
554554
* filesystems that don't need it and also allows us to create the workqueue
555555
* late enough so the we can include s_id in the name of the workqueue.
556556
*/
557-
static int sb_init_dio_done_wq(struct super_block *sb)
557+
int sb_init_dio_done_wq(struct super_block *sb)
558558
{
559559
struct workqueue_struct *old;
560560
struct workqueue_struct *wq = alloc_workqueue("dio/%s",

fs/internal.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,6 @@ typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len,
184184
loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length,
185185
unsigned flags, struct iomap_ops *ops, void *data,
186186
iomap_actor_t actor);
187+
188+
/* direct-io.c: */
189+
int sb_init_dio_done_wq(struct super_block *sb);

0 commit comments

Comments
 (0)