Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-23 13:50:48 -08:00
parent d0fff27c85 de70b29bad
commit b183bd7ae1
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/Makefile.in
View File

@ -79,7 +79,7 @@ ${MODULE}-objs += zfs_fuid.o
# ${MODULE}-objs += zfs_rlock.o # ${MODULE}-objs += zfs_rlock.o
# ${MODULE}-objs += zfs_vfsops.o # ${MODULE}-objs += zfs_vfsops.o
# ${MODULE}-objs += zfs_vnops.o # ${MODULE}-objs += zfs_vnops.o
${MODULE}-objs += zfs_znode.o # ${MODULE}-objs += zfs_znode.o
${MODULE}-objs += zil.o ${MODULE}-objs += zil.o
${MODULE}-objs += zio.o ${MODULE}-objs += zio.o
${MODULE}-objs += zio_checksum.o ${MODULE}-objs += zio_checksum.o

2
module/zfs/include/sys/zfs_znode.h
View File

@ -341,8 +341,10 @@ extern void zfs_log_acl(zilog_t *zilog, dmu_tx_t *tx, znode_t *zp,
extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap); extern void zfs_xvattr_set(znode_t *zp, xvattr_t *xvap);
extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx); extern void zfs_upgrade(zfsvfs_t *zfsvfs, dmu_tx_t *tx);
#if defined(HAVE_UIO_RW)
extern caddr_t zfs_map_page(page_t *, enum seg_rw); extern caddr_t zfs_map_page(page_t *, enum seg_rw);
extern void zfs_unmap_page(page_t *, caddr_t); extern void zfs_unmap_page(page_t *, caddr_t);
#endif /* HAVE_UIO_RW */
extern zil_get_data_t zfs_get_data; extern zil_get_data_t zfs_get_data;
extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE]; extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE];

2
module/zfs/zfs_vnops.c
View File

@ -317,6 +317,7 @@ zfs_ioctl(vnode_t *vp, int com, intptr_t data, int flag, cred_t *cred,
return (ENOTTY); return (ENOTTY);
} }
#if defined(_KERNEL) && defined(HAVE_UIO_RW)
/* /*
* Utility functions to map and unmap a single physical page. These * Utility functions to map and unmap a single physical page. These
* are used to manage the mappable copies of ZFS file data, and therefore * are used to manage the mappable copies of ZFS file data, and therefore
@ -341,6 +342,7 @@ zfs_unmap_page(page_t *pp, caddr_t addr)
ppmapout(addr); ppmapout(addr);
} }
} }
#endif /* _KERNEL && HAVE_UIO_RW */
/* /*
* When a file is memory mapped, we must keep the IO data synchronized * When a file is memory mapped, we must keep the IO data synchronized