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

Commit ce8e922c authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Complete the pagebuf -> xfs_buf naming convention transition, 


finally.

SGI-PV: 947038
SGI-Modid: xfs-linux-melb:xfs-kern:24866a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 68bdb6ea

fs/xfs/linux-2.6/xfs_aops.c

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ xfs_map_at_offset( 


	lock_buffer(bh);

	bh->b_blocknr = bn;

	bh->b_bdev = iomapp->iomap_target->pbr_bdev;

	bh->b_bdev = iomapp->iomap_target->bt_bdev;

	set_buffer_mapped(bh);

	clear_buffer_delay(bh);

}
@@ -982,7 +982,7 @@ __linvfs_get_block( 
	}



	/* If this is a realtime file, data might be on a new device */

	bh_result->b_bdev = iomap.iomap_target->pbr_bdev;

	bh_result->b_bdev = iomap.iomap_target->bt_bdev;



	/* If we previously allocated a block out beyond eof and

	 * we are now coming back to use it then we will need to
@@ -1097,7 +1097,7 @@ linvfs_direct_IO( 
	iocb->private = xfs_alloc_ioend(inode);



	ret = blockdev_direct_IO_own_locking(rw, iocb, inode,

		iomap.iomap_target->pbr_bdev,

		iomap.iomap_target->bt_bdev,

		iov, offset, nr_segs,

		linvfs_get_blocks_direct,

		linvfs_end_io_direct);

fs/xfs/linux-2.6/xfs_buf.c

+585 −673

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/linux-2.6/xfs_buf.h

+280 −413

File changed.

Preview size limit exceeded, changes collapsed.

fs/xfs/linux-2.6/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ xfs_ioctl( 
			(ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?

			mp->m_rtdev_targp : mp->m_ddev_targp;



		da.d_mem = da.d_miniosz = 1 << target->pbr_sshift;

		da.d_mem = da.d_miniosz = 1 << target->bt_sshift;

		da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);



		if (copy_to_user(arg, &da, sizeof(da)))

fs/xfs/linux-2.6/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static inline void set_buffer_unwritten_io(struct buffer_head *bh) 
#define xfs_itruncate_data(ip, off)	\

	(-vmtruncate(LINVFS_GET_IP(XFS_ITOV(ip)), (off)))

#define xfs_statvfs_fsid(statp, mp)	\

	({ u64 id = huge_encode_dev((mp)->m_dev);	\

	({ u64 id = huge_encode_dev((mp)->m_ddev_targp->bt_dev); \

	   __kernel_fsid_t *fsid = &(statp)->f_fsid;	\

	(fsid->val[0] = (u32)id, fsid->val[1] = (u32)(id >> 32)); })