Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 (9f5974c8) · Commits · e / devices / android_kernel_fairphone_FP3

fs/xfs/linux-2.6/xfs_aops.c

+590 −498

File changed.

Preview size limit exceeded, changes collapsed.

+10 −0

Original line number	Diff line number	Diff line
		@@ -23,14 +23,24 @@ extern mempool_t *xfs_ioend_pool;

		typedef void (xfs_ioend_func_t)(void );

		/*
		* xfs_ioend struct manages large extent writes for XFS.
		* It can manage several multi-page bio's at once.
		*/
		typedef struct xfs_ioend {
		struct xfs_ioend io_list; / next ioend in chain */
		unsigned int io_type; /* delalloc / unwritten */
		unsigned int io_uptodate; /* I/O status register */
		atomic_t io_remaining; /* hold count */
		struct vnode io_vnode; / file being written to */
		struct buffer_head io_buffer_head;/ buffer linked list head */
		struct buffer_head io_buffer_tail;/ buffer linked list tail */
		size_t io_size; /* size of the extent */
		xfs_off_t io_offset; /* offset in the file */
		struct work_struct io_work; /* xfsdatad work queue */
		} xfs_ioend_t;

		extern struct address_space_operations linvfs_aops;
		extern int linvfs_get_block(struct inode , sector_t, struct buffer_head , int);

		#endif /* __XFS_IOPS_H__ */

+666 −707

File changed.

Preview size limit exceeded, changes collapsed.

+286 −410

File changed.

Preview size limit exceeded, changes collapsed.

+2 −4

Original line number	Diff line number	Diff line
		@@ -509,16 +509,14 @@ linvfs_open_exec(
		vnode_t *vp = LINVFS_GET_VP(inode);
		xfs_mount_t *mp = XFS_VFSTOM(vp->v_vfsp);
		int error = 0;
		bhv_desc_t *bdp;
		xfs_inode_t *ip;

		if (vp->v_vfsp->vfs_flag & VFS_DMI) {
		bdp = vn_bhv_lookup(VN_BHV_HEAD(vp), &xfs_vnodeops);
		if (!bdp) {
		ip = xfs_vtoi(vp);
		if (!ip) {
		error = -EINVAL;
		goto open_exec_out;
		}
		ip = XFS_BHVTOI(bdp);
		if (DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ)) {
		error = -XFS_SEND_DATA(mp, DM_EVENT_READ, vp,
		0, 0, 0, NULL);