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

Merge tag 'xfs-for-linus-3.15-rc1' of git://oss.sgi.com/xfs/xfs 

Pull xfs update from Dave Chinner:
 "There are a couple of new fallocate features in this request - it was
  decided that it was easiest to push them through the XFS tree using
  topic branches and have the ext4 support be based on those branches.
  Hence you may see some overlap with the ext4 tree merge depending on
  how they including those topic branches into their tree.  Other than
  that, there is O_TMPFILE support, some cleanups and bug fixes.

  The main changes in the XFS tree for 3.15-rc1 are:

   - O_TMPFILE support
   - allowing AIO+DIO writes beyond EOF
   - FALLOC_FL_COLLAPSE_RANGE support for fallocate syscall and XFS
     implementation
   - FALLOC_FL_ZERO_RANGE support for fallocate syscall and XFS
     implementation
   - IO verifier cleanup and rework
   - stack usage reduction changes
   - vm_map_ram NOIO context fixes to remove lockdep warings
   - various bug fixes and cleanups"

* tag 'xfs-for-linus-3.15-rc1' of git://oss.sgi.com/xfs/xfs: (34 commits)
  xfs: fix directory hash ordering bug
  xfs: extra semi-colon breaks a condition
  xfs: Add support for FALLOC_FL_ZERO_RANGE
  fs: Introduce FALLOC_FL_ZERO_RANGE flag for fallocate
  xfs: inode log reservations are still too small
  xfs: xfs_check_page_type buffer checks need help
  xfs: avoid AGI/AGF deadlock scenario for inode chunk allocation
  xfs: use NOIO contexts for vm_map_ram
  xfs: don't leak EFSBADCRC to userspace
  xfs: fix directory inode iolock lockdep false positive
  xfs: allocate xfs_da_args to reduce stack footprint
  xfs: always do log forces via the workqueue
  xfs: modify verifiers to differentiate CRC from other errors
  xfs: print useful caller information in xfs_error_report
  xfs: add xfs_verifier_error()
  xfs: add helper for updating checksums on xfs_bufs
  xfs: add helper for verifying checksums on xfs_bufs
  xfs: Use defines for CRC offsets in all cases
  xfs: skip pointless CRC updates after verifier failures
  xfs: Add support FALLOC_FL_COLLAPSE_RANGE for fallocate
  ...
parents 24e7ea3b a6cf33bc

fs/direct-io.c

+12 −6
Original line number Diff line number Diff line
@@ -1193,13 +1193,19 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
	}



	/*

	 * For file extending writes updating i_size before data

	 * writeouts complete can expose uninitialized blocks. So

	 * even for AIO, we need to wait for i/o to complete before

	 * returning in this case.

	 * For file extending writes updating i_size before data writeouts

	 * complete can expose uninitialized blocks in dumb filesystems.

	 * In that case we need to wait for I/O completion even if asked

	 * for an asynchronous write.

	 */

	dio->is_async = !is_sync_kiocb(iocb) && !((rw & WRITE) &&

		(end > i_size_read(inode)));

	if (is_sync_kiocb(iocb))

		dio->is_async = false;

	else if (!(dio->flags & DIO_ASYNC_EXTEND) &&

            (rw & WRITE) && end > i_size_read(inode))

		dio->is_async = false;

	else

		dio->is_async = true;



	dio->inode = inode;

	dio->rw = rw;

fs/open.c

+26 −3
Original line number Diff line number Diff line
@@ -231,7 +231,13 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
		return -EINVAL;



	/* Return error if mode is not supported */

	if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE))

	if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE |

		     FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE))

		return -EOPNOTSUPP;



	/* Punch hole and zero range are mutually exclusive */

	if ((mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE)) ==

	    (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_ZERO_RANGE))

		return -EOPNOTSUPP;



	/* Punch hole must have keep size set */
@@ -239,11 +245,20 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	    !(mode & FALLOC_FL_KEEP_SIZE))

		return -EOPNOTSUPP;



	/* Collapse range should only be used exclusively. */

	if ((mode & FALLOC_FL_COLLAPSE_RANGE) &&

	    (mode & ~FALLOC_FL_COLLAPSE_RANGE))

		return -EINVAL;



	if (!(file->f_mode & FMODE_WRITE))

		return -EBADF;



	/* It's not possible punch hole on append only file */

	if (mode & FALLOC_FL_PUNCH_HOLE && IS_APPEND(inode))

	/*

	 * It's not possible to punch hole or perform collapse range

	 * on append only file

	 */

	if (mode & (FALLOC_FL_PUNCH_HOLE | FALLOC_FL_COLLAPSE_RANGE)

	    && IS_APPEND(inode))

		return -EPERM;



	if (IS_IMMUTABLE(inode))
@@ -271,6 +286,14 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0))

		return -EFBIG;



	/*

	 * There is no need to overlap collapse range with EOF, in which case

	 * it is effectively a truncate operation

	 */

	if ((mode & FALLOC_FL_COLLAPSE_RANGE) &&

	    (offset + len >= i_size_read(inode)))

		return -EINVAL;



	if (!file->f_op->fallocate)

		return -EOPNOTSUPP;

fs/xfs/kmem.c

+20 −1
Original line number Diff line number Diff line
@@ -65,12 +65,31 @@ kmem_alloc(size_t size, xfs_km_flags_t flags) 
void *

kmem_zalloc_large(size_t size, xfs_km_flags_t flags)

{

	unsigned noio_flag = 0;

	void	*ptr;

	gfp_t	lflags;



	ptr = kmem_zalloc(size, flags | KM_MAYFAIL);

	if (ptr)

		return ptr;

	return vzalloc(size);



	/*

	 * __vmalloc() will allocate data pages and auxillary structures (e.g.

	 * pagetables) with GFP_KERNEL, yet we may be under GFP_NOFS context

	 * here. Hence we need to tell memory reclaim that we are in such a

	 * context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering

	 * the filesystem here and potentially deadlocking.

	 */

	if ((current->flags & PF_FSTRANS) || (flags & KM_NOFS))

		noio_flag = memalloc_noio_save();



	lflags = kmem_flags_convert(flags);

	ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);



	if ((current->flags & PF_FSTRANS) || (flags & KM_NOFS))

		memalloc_noio_restore(noio_flag);



	return ptr;

}



void

fs/xfs/xfs_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	if (!acl)

		goto set_acl;



	error = -EINVAL;

	error = -E2BIG;

	if (acl->a_count > XFS_ACL_MAX_ENTRIES(XFS_M(inode->i_sb)))

		return error;

fs/xfs/xfs_ag.h

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ typedef struct xfs_agf { 
	/* structure must be padded to 64 bit alignment */

} xfs_agf_t;



#define XFS_AGF_CRC_OFF		offsetof(struct xfs_agf, agf_crc)



#define	XFS_AGF_MAGICNUM	0x00000001

#define	XFS_AGF_VERSIONNUM	0x00000002

#define	XFS_AGF_SEQNO		0x00000004
@@ -167,6 +169,8 @@ typedef struct xfs_agi { 
	/* structure must be padded to 64 bit alignment */

} xfs_agi_t;



#define XFS_AGI_CRC_OFF		offsetof(struct xfs_agi, agi_crc)



#define	XFS_AGI_MAGICNUM	0x00000001

#define	XFS_AGI_VERSIONNUM	0x00000002

#define	XFS_AGI_SEQNO		0x00000004
@@ -222,6 +226,8 @@ typedef struct xfs_agfl { 
	__be32		agfl_bno[];	/* actually XFS_AGFL_SIZE(mp) */

} xfs_agfl_t;



#define XFS_AGFL_CRC_OFF	offsetof(struct xfs_agfl, agfl_crc)



/*

 * tags for inode radix tree

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE