Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a27fcb0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-4.11-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Darrick Wong:
 "Here are the XFS changes for 4.11. We aren't introducing any major
  features in this release cycle except for this being the first merge
  window I've managed on my own. :)

  Changes since last update:

   - Various cleanups

   - Livelock fixes for eofblocks scanning

   - Improved input verification for on-disk metadata

   - Fix races in the copy on write remap mechanism

   - Fix buffer io error timeout controls

   - Streamlining of directio copy on write

   - Asynchronous discard support

   - Fix asserts when splitting delalloc reservations

   - Don't bloat bmbt when right shifting extents

   - Inode alignment fixes for 32k block sizes"

* tag 'xfs-4.11-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (39 commits)
  xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG
  xfs: simplify xfs_rtallocate_extent
  xfs: tune down agno asserts in the bmap code
  xfs: Use xfs_icluster_size_fsb() to calculate inode chunk alignment
  xfs: don't reserve blocks for right shift transactions
  xfs: fix len comparison in xfs_extent_busy_trim
  xfs: fix uninitialized variable in _reflink_convert_cow
  xfs: split indlen reservations fairly when under reserved
  xfs: handle indlen shortage on delalloc extent merge
  xfs: resurrect debug mode drop buffered writes mechanism
  xfs: clear delalloc and cache on buffered write failure
  xfs: don't block the log commit handler for discards
  xfs: improve busy extent sorting
  xfs: improve handling of busy extents in the low-level allocator
  xfs: don't fail xfs_extent_busy allocation
  xfs: correct null checks and error processing in xfs_initialize_perag
  xfs: update ctime and mtime on clone destinatation inodes
  xfs: allocate direct I/O COW blocks in iomap_begin
  xfs: go straight to real allocations for direct I/O COW writes
  xfs: return the converted extent in __xfs_reflink_convert_cow
  ...
parents 7d91de74 8d242e93

fs/dax.c

+3 −3
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
 */

ssize_t

dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,

		struct iomap_ops *ops)

		const struct iomap_ops *ops)

{

	struct address_space *mapping = iocb->ki_filp->f_mapping;

	struct inode *inode = mapping->host;
@@ -1127,7 +1127,7 @@ static int dax_fault_return(int error) 
 * necessary locking for the page fault to proceed successfully.

 */

int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf,

			struct iomap_ops *ops)

			const struct iomap_ops *ops)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	struct inode *inode = mapping->host;
@@ -1326,7 +1326,7 @@ static int dax_pmd_load_hole(struct vm_area_struct *vma, pmd_t *pmd, 
}



int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,

		pmd_t *pmd, unsigned int flags, struct iomap_ops *ops)

		pmd_t *pmd, unsigned int flags, const struct iomap_ops *ops)

{

	struct address_space *mapping = vma->vm_file->f_mapping;

	unsigned long pmd_addr = address & PMD_MASK;

fs/ext2/ext2.h

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ extern const struct file_operations ext2_file_operations; 
/* inode.c */

extern const struct address_space_operations ext2_aops;

extern const struct address_space_operations ext2_nobh_aops;

extern struct iomap_ops ext2_iomap_ops;

extern const struct iomap_ops ext2_iomap_ops;



/* namei.c */

extern const struct inode_operations ext2_dir_inode_operations;

fs/ext2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -842,13 +842,13 @@ ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length, 
	return 0;

}



struct iomap_ops ext2_iomap_ops = {

const struct iomap_ops ext2_iomap_ops = {

	.iomap_begin		= ext2_iomap_begin,

	.iomap_end		= ext2_iomap_end,

};

#else

/* Define empty ops for !CONFIG_FS_DAX case to avoid ugly ifdefs */

struct iomap_ops ext2_iomap_ops;

const struct iomap_ops ext2_iomap_ops;

#endif /* CONFIG_FS_DAX */



int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -3244,7 +3244,7 @@ static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end) 
	}

}



extern struct iomap_ops ext4_iomap_ops;

extern const struct iomap_ops ext4_iomap_ops;



#endif	/* __KERNEL__ */

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3450,7 +3450,7 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length, 
	return ret;

}



struct iomap_ops ext4_iomap_ops = {

const struct iomap_ops ext4_iomap_ops = {

	.iomap_begin		= ext4_iomap_begin,

	.iomap_end		= ext4_iomap_end,

};