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

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

Merge branch 'for-linus' of git://github.com/chrismason/linux 

* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: add dummy extent if dst offset excceeds file end in
  Btrfs: calc file extent num_bytes correctly in file clone
  btrfs: xattr: fix attribute removal
  Btrfs: fix wrong nbytes information of the inode
  Btrfs: fix the file extent gap when doing direct IO
  Btrfs: fix unclosed transaction handle in btrfs_cont_expand
  Btrfs: fix misuse of trans block rsv
  Btrfs: reset to appropriate block rsv after orphan operations
  Btrfs: skip locking if searching the commit root in csum lookup
  btrfs: fix warning in iput for bad-inode
  Btrfs: fix an oops when deleting snapshots
parents 5dfcc87f d525e8ab

fs/btrfs/btrfs_inode.h

+5 −1
Original line number Diff line number Diff line
@@ -176,7 +176,11 @@ static inline u64 btrfs_ino(struct inode *inode) 
{

	u64 ino = BTRFS_I(inode)->location.objectid;



	if (ino <= BTRFS_FIRST_FREE_OBJECTID)

	/*

	 * !ino: btree_inode

	 * type == BTRFS_ROOT_ITEM_KEY: subvol dir

	 */

	if (!ino || BTRFS_I(inode)->location.type == BTRFS_ROOT_ITEM_KEY)

		ino = inode->i_ino;

	return ino;

}

fs/btrfs/file-item.c

+3 −1
Original line number Diff line number Diff line
@@ -183,8 +183,10 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, 
	 * read from the commit root and sidestep a nasty deadlock

	 * between reading the free space cache and updating the csum tree.

	 */

	if (btrfs_is_free_space_inode(root, inode))

	if (btrfs_is_free_space_inode(root, inode)) {

		path->search_commit_root = 1;

		path->skip_locking = 1;

	}



	disk_bytenr = (u64)bio->bi_sector << 9;

	if (dio)

fs/btrfs/file.c

+10 −6
Original line number Diff line number Diff line
@@ -1075,12 +1075,6 @@ static noinline int prepare_pages(struct btrfs_root *root, struct file *file, 
	start_pos = pos & ~((u64)root->sectorsize - 1);

	last_pos = ((u64)index + num_pages) << PAGE_CACHE_SHIFT;



	if (start_pos > inode->i_size) {

		err = btrfs_cont_expand(inode, i_size_read(inode), start_pos);

		if (err)

			return err;

	}



again:

	for (i = 0; i < num_pages; i++) {

		pages[i] = find_or_create_page(inode->i_mapping, index + i,
@@ -1338,6 +1332,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, 
	struct inode *inode = fdentry(file)->d_inode;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	loff_t *ppos = &iocb->ki_pos;

	u64 start_pos;

	ssize_t num_written = 0;

	ssize_t err = 0;

	size_t count, ocount;
@@ -1386,6 +1381,15 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb, 
	file_update_time(file);

	BTRFS_I(inode)->sequence++;



	start_pos = round_down(pos, root->sectorsize);

	if (start_pos > i_size_read(inode)) {

		err = btrfs_cont_expand(inode, i_size_read(inode), start_pos);

		if (err) {

			mutex_unlock(&inode->i_mutex);

			goto out;

		}

	}



	if (unlikely(file->f_flags & O_DIRECT)) {

		num_written = __btrfs_direct_write(iocb, iov, nr_segs,

						   pos, ppos, count, ocount);

fs/btrfs/free-space-cache.c

+4 −0
Original line number Diff line number Diff line
@@ -190,9 +190,11 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root, 
				    struct btrfs_path *path,

				    struct inode *inode)

{

	struct btrfs_block_rsv *rsv;

	loff_t oldsize;

	int ret = 0;



	rsv = trans->block_rsv;

	trans->block_rsv = root->orphan_block_rsv;

	ret = btrfs_block_rsv_check(trans, root,

				    root->orphan_block_rsv,
@@ -210,6 +212,8 @@ int btrfs_truncate_free_space_cache(struct btrfs_root *root, 
	 */

	ret = btrfs_truncate_inode_items(trans, root, inode,

					 0, BTRFS_EXTENT_DATA_KEY);



	trans->block_rsv = rsv;

	if (ret) {

		WARN_ON(1);

		return ret;

fs/btrfs/inode.c

+11 −11
Original line number Diff line number Diff line
@@ -1786,7 +1786,7 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) 
			  &ordered_extent->list);



	ret = btrfs_ordered_update_i_size(inode, 0, ordered_extent);

	if (!ret) {

	if (!ret || !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) {

		ret = btrfs_update_inode(trans, root, inode);

		BUG_ON(ret);

	}
@@ -3510,15 +3510,19 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size) 
			err = btrfs_drop_extents(trans, inode, cur_offset,

						 cur_offset + hole_size,

						 &hint_byte, 1);

			if (err)

			if (err) {

				btrfs_end_transaction(trans, root);

				break;

			}



			err = btrfs_insert_file_extent(trans, root,

					btrfs_ino(inode), cur_offset, 0,

					0, hole_size, 0, hole_size,

					0, 0, 0);

			if (err)

			if (err) {

				btrfs_end_transaction(trans, root);

				break;

			}



			btrfs_drop_extent_cache(inode, hole_start,

					last_byte - 1, 0);
@@ -3952,7 +3956,6 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, 
			 struct btrfs_root *root, int *new)

{

	struct inode *inode;

	int bad_inode = 0;



	inode = btrfs_iget_locked(s, location->objectid, root);

	if (!inode)
@@ -3968,14 +3971,11 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, 
			if (new)

				*new = 1;

		} else {

			bad_inode = 1;

		}

	}



	if (bad_inode) {

			unlock_new_inode(inode);

			iput(inode);

			inode = ERR_PTR(-ESTALE);

		}

	}



	return inode;

}
@@ -5823,7 +5823,7 @@ static void btrfs_endio_direct_write(struct bio *bio, int err) 


	add_pending_csums(trans, inode, ordered->file_offset, &ordered->list);

	ret = btrfs_ordered_update_i_size(inode, 0, ordered);

	if (!ret)

	if (!ret || !test_bit(BTRFS_ORDERED_PREALLOC, &ordered->flags))

		btrfs_update_inode(trans, root, inode);

	ret = 0;

out_unlock: