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

Commit 70a50528 authored by Vlad Apostolov's avatar Vlad Apostolov Committed by Tim Shimmin
Browse files

[XFS] rename uio_read() to xfs_uio_read() 



SGI-PV: 957004
SGI-Modid: xfs-linux-melb:xfs-kern:27231a

Signed-off-by: default avatarVlad Apostolov <vapo@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 439b8434

fs/xfs/support/move.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * as we go.

 */

int

uio_read(caddr_t src, size_t len, struct uio *uio)

xfs_uio_read(caddr_t src, size_t len, struct uio *uio)

{

	size_t	count;

fs/xfs/support/move.h

+1 −1
Original line number Diff line number Diff line
@@ -65,6 +65,6 @@ struct uio { 
typedef struct uio uio_t;

typedef struct iovec iovec_t;



extern int	uio_read (caddr_t, size_t, uio_t *);

extern int	xfs_uio_read (caddr_t, size_t, uio_t *);



#endif  /* __XFS_SUPPORT_MOVE_H__ */

fs/xfs/xfs_dir2.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ xfs_dir2_put_dirent64_uio( 
	idbp->d_off = pa->cook;

	idbp->d_name[namelen] = '\0';

	memcpy(idbp->d_name, pa->name, namelen);

	rval = uio_read((caddr_t)idbp, reclen, uio);

	rval = xfs_uio_read((caddr_t)idbp, reclen, uio);

	pa->done = (rval == 0);

	return rval;

}

fs/xfs/xfs_vnodeops.c

+2 −2
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ xfs_readlink( 
	pathlen = (int)ip->i_d.di_size;



	if (ip->i_df.if_flags & XFS_IFINLINE) {

		error = uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);

		error = xfs_uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);

	}

	else {

		/*
@@ -1044,7 +1044,7 @@ xfs_readlink( 
				byte_cnt = pathlen;

			pathlen -= byte_cnt;



			error = uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);

			error = xfs_uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);

			xfs_buf_relse (bp);

		}