Merge branch 'xfs-extent-list-locking-fixes' into for-next (bf3964c1) · Commits · 戴 / test

fs/xfs/xfs_aops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1217,7 +1217,7 @@ __xfs_get_blocks(
		lockmode = XFS_ILOCK_EXCL;
		xfs_ilock(ip, lockmode);
		} else {
		lockmode = xfs_ilock_map_shared(ip);
		lockmode = xfs_ilock_data_map_shared(ip);
		}

		ASSERT(offset <= mp->m_super->s_maxbytes);

fs/xfs/xfs_attr.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@ xfs_attr_get(
		{
		int error;
		struct xfs_name xname;
		uint lock_mode;

		XFS_STATS_INC(xs_attr_get);

		@@ -174,9 +175,9 @@ xfs_attr_get(
		if (error)
		return error;

		xfs_ilock(ip, XFS_ILOCK_SHARED);
		lock_mode = xfs_ilock_attr_map_shared(ip);
		error = xfs_attr_get_int(ip, &xname, value, valuelenp, flags);
		xfs_iunlock(ip, XFS_ILOCK_SHARED);
		xfs_iunlock(ip, lock_mode);
		return(error);
		}

fs/xfs/xfs_attr_list.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -507,17 +507,17 @@ xfs_attr_list_int(
		{
		int error;
		xfs_inode_t *dp = context->dp;
		uint lock_mode;

		XFS_STATS_INC(xs_attr_list);

		if (XFS_FORCED_SHUTDOWN(dp->i_mount))
		return EIO;

		xfs_ilock(dp, XFS_ILOCK_SHARED);

		/*
		* Decide on what work routines to call based on the inode size.
		*/
		lock_mode = xfs_ilock_attr_map_shared(dp);
		if (!xfs_inode_hasattr(dp)) {
		error = 0;
		} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
		@@ -527,9 +527,7 @@ xfs_attr_list_int(
		} else {
		error = xfs_attr_node_list(context);
		}

		xfs_iunlock(dp, XFS_ILOCK_SHARED);

		xfs_iunlock(dp, lock_mode);
		return error;
		}

fs/xfs/xfs_bmap.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -4013,6 +4013,7 @@ xfs_bmapi_read(
		ASSERT(*nmap >= 1);
		ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK\|XFS_BMAPI_ENTIRE\|
		XFS_BMAPI_IGSTATE)));
		ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED\|XFS_ILOCK_EXCL));

		if (unlikely(XFS_TEST_ERROR(
		(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
		@@ -4207,6 +4208,7 @@ xfs_bmapi_delay(
		ASSERT(*nmap >= 1);
		ASSERT(*nmap <= XFS_BMAP_MAX_NMAP);
		ASSERT(!(flags & ~XFS_BMAPI_ENTIRE));
		ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));

		if (unlikely(XFS_TEST_ERROR(
		(XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
		@@ -4500,6 +4502,7 @@ xfs_bmapi_write(
		ASSERT(tp != NULL);
		ASSERT(len > 0);
		ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL);
		ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));

		if (unlikely(XFS_TEST_ERROR(
		(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
		@@ -5051,6 +5054,7 @@ xfs_bunmapi(
		if (XFS_FORCED_SHUTDOWN(mp))
		return XFS_ERROR(EIO);

		ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
		ASSERT(len > 0);
		ASSERT(nexts >= 0);

fs/xfs/xfs_bmap_util.c

+23 −12

Original line number	Diff line number	Diff line
		@@ -618,22 +618,27 @@ xfs_getbmap(
		return XFS_ERROR(ENOMEM);

		xfs_ilock(ip, XFS_IOLOCK_SHARED);
		if (whichfork == XFS_DATA_FORK && !(iflags & BMV_IF_DELALLOC)) {
		if (ip->i_delayed_blks \|\| XFS_ISIZE(ip) > ip->i_d.di_size) {
		if (whichfork == XFS_DATA_FORK) {
		if (!(iflags & BMV_IF_DELALLOC) &&
		(ip->i_delayed_blks \|\| XFS_ISIZE(ip) > ip->i_d.di_size)) {
		error = -filemap_write_and_wait(VFS_I(ip)->i_mapping);
		if (error)
		goto out_unlock_iolock;
		}

		/*
		* even after flushing the inode, there can still be delalloc
		* blocks on the inode beyond EOF due to speculative
		* preallocation. These are not removed until the release
		* function is called or the inode is inactivated. Hence we
		* cannot assert here that ip->i_delayed_blks == 0.
		* Even after flushing the inode, there can still be
		* delalloc blocks on the inode beyond EOF due to
		* speculative preallocation. These are not removed
		* until the release function is called or the inode
		* is inactivated. Hence we cannot assert here that
		* ip->i_delayed_blks == 0.
		*/
		}

		lock = xfs_ilock_map_shared(ip);
		lock = xfs_ilock_data_map_shared(ip);
		} else {
		lock = xfs_ilock_attr_map_shared(ip);
		}

		/*
		* Don't let nex be bigger than the number of extents
		@@ -738,7 +743,7 @@ xfs_getbmap(
		out_free_map:
		kmem_free(map);
		out_unlock_ilock:
		xfs_iunlock_map_shared(ip, lock);
		xfs_iunlock(ip, lock);
		out_unlock_iolock:
		xfs_iunlock(ip, XFS_IOLOCK_SHARED);

		@@ -1169,9 +1174,15 @@ xfs_zero_remaining_bytes(
		xfs_buf_unlock(bp);

		for (offset = startoff; offset <= endoff; offset = lastoffset + 1) {
		uint lock_mode;

		offset_fsb = XFS_B_TO_FSBT(mp, offset);
		nimap = 1;

		lock_mode = xfs_ilock_data_map_shared(ip);
		error = xfs_bmapi_read(ip, offset_fsb, 1, &imap, &nimap, 0);
		xfs_iunlock(ip, lock_mode);

		if (error \|\| nimap < 1)
		break;
		ASSERT(imap.br_blockcount >= 1);

Admin message