Commit 0b166a57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates from Ted Ts'o:
 "A lot of bug fixes and cleanups for ext4, including:

   - Fix performance problems found in dioread_nolock now that it is the
     default, caused by transaction leaks.

   - Clean up fiemap handling in ext4

   - Clean up and refactor multiple block allocator (mballoc) code

   - Fix a problem with mballoc with a smaller file systems running out
     of blocks because they couldn't properly use blocks that had been
     reserved by inode preallocation.

   - Fixed a race in ext4_sync_parent() versus rename()

   - Simplify the error handling in the extent manipulation code

   - Make sure all metadata I/O errors are felected to
     ext4_ext_dirty()'s and ext4_make_inode_dirty()'s callers.

   - Avoid passing an error pointer to brelse in ext4_xattr_set()

   - Fix race which could result to freeing an inode on the dirty last
     in data=journal mode.

   - Fix refcount handling if ext4_iget() fails

   - Fix a crash in generic/019 caused by a corrupted extent node"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (58 commits)
  ext4: avoid unnecessary transaction starts during writeback
  ext4: don't block for O_DIRECT if IOCB_NOWAIT is set
  ext4: remove the access_ok() check in ext4_ioctl_get_es_cache
  fs: remove the access_ok() check in ioctl_fiemap
  fs: handle FIEMAP_FLAG_SYNC in fiemap_prep
  fs: move fiemap range validation into the file systems instances
  iomap: fix the iomap_fiemap prototype
  fs: move the fiemap definitions out of fs.h
  fs: mark __generic_block_fiemap static
  ext4: remove the call to fiemap_check_flags in ext4_fiemap
  ext4: split _ext4_fiemap
  ext4: fix fiemap size checks for bitmap files
  ext4: fix EXT4_MAX_LOGICAL_BLOCK macro
  add comment for ext4_dir_entry_2 file_type member
  jbd2: avoid leaking transaction credits when unreserving handle
  ext4: drop ext4_journal_free_reserved()
  ext4: mballoc: use lock for checking free blocks while retrying
  ext4: mballoc: refactor ext4_mb_good_group()
  ext4: mballoc: introduce pcpu seqcnt for freeing PA to improve ENOSPC handling
  ext4: mballoc: refactor ext4_mb_discard_preallocations()
  ...
parents b25c6644 6b8ed620

Documentation/filesystems/fiemap.rst

+7 −5
Original line number Diff line number Diff line
@@ -206,16 +206,18 @@ EINTR once fatal signal received. 




Flag checking should be done at the beginning of the ->fiemap callback via the

fiemap_check_flags() helper::

fiemap_prep() helper::



  int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);

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

		  u64 start, u64 *len, u32 supported_flags);



The struct fieinfo should be passed in as received from ioctl_fiemap(). The

set of fiemap flags which the fs understands should be passed via fs_flags. If

fiemap_check_flags finds invalid user flags, it will place the bad values in

fiemap_prep finds invalid user flags, it will place the bad values in

fieinfo->fi_flags and return -EBADR. If the file system gets -EBADR, from

fiemap_check_flags(), it should immediately exit, returning that error back to

ioctl_fiemap().

fiemap_prep(), it should immediately exit, returning that error back to

ioctl_fiemap().  Additionally the range is validate against the supported

maximum file size.





For each extent in the request range, the file system should call

fs/bad_inode.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/time.h>

#include <linux/namei.h>

#include <linux/poll.h>

#include <linux/fiemap.h>



static int bad_file_open(struct inode *inode, struct file *filp)

{

fs/btrfs/extent_io.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/rbtree.h>

#include <linux/refcount.h>

#include <linux/fiemap.h>

#include "ulist.h"



/*

fs/btrfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -7828,14 +7828,12 @@ const struct iomap_dio_ops btrfs_dops = { 
	.submit_io		= btrfs_submit_direct,

};



#define BTRFS_FIEMAP_FLAGS	(FIEMAP_FLAG_SYNC)



static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		__u64 start, __u64 len)

{

	int	ret;



	ret = fiemap_check_flags(fieinfo, BTRFS_FIEMAP_FLAGS);

	ret = fiemap_prep(inode, fieinfo, start, &len, 0);

	if (ret)

		return ret;

fs/cifs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/freezer.h>

#include <linux/sched/signal.h>

#include <linux/wait_bit.h>

#include <linux/fiemap.h>



#include <asm/div64.h>

#include "cifsfs.h"