X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_super.c;h=304f708c326b1935f28f058c60f36ef85abc8033;hb=b312979252c5b566d2f59febcda67f309637e18c;hp=d3037f498f55318ed00453941488c0636967f41f;hpb=7a1cdc0775aa4405501e64ebf0bfd998e723f2d7;p=zfs.git diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c index d3037f4..304f708 100644 --- a/module/zfs/zpl_super.c +++ b/module/zfs/zpl_super.c @@ -73,7 +73,7 @@ zpl_inode_destroy(struct inode *ip) static void zpl_evict_inode(struct inode *ip) { - truncate_inode_pages(&ip->i_data, 0); + truncate_setsize(ip, 0); end_writeback(ip); zfs_inactive(ip); } @@ -89,7 +89,7 @@ zpl_clear_inode(struct inode *ip) static void zpl_inode_delete(struct inode *ip) { - truncate_inode_pages(&ip->i_data, 0); + truncate_setsize(ip, 0); clear_inode(ip); } @@ -107,12 +107,12 @@ zpl_put_super(struct super_block *sb) static int zpl_sync_fs(struct super_block *sb, int wait) { - cred_t *cr; + cred_t *cr = CRED(); int error; - cr = (cred_t *)get_current_cred(); + crhold(cr); error = -zfs_sync(sb, wait, cr); - put_cred(cr); + crfree(cr); ASSERT3S(error, <=, 0); return (error); @@ -210,14 +210,6 @@ const struct super_operations zpl_super_operations = { .show_stats = NULL, }; -#if 0 -const struct export_operations zpl_export_operations = { - .fh_to_dentry = NULL, - .fh_to_parent = NULL, - .get_parent = NULL, -}; -#endif - struct file_system_type zpl_fs_type = { .owner = THIS_MODULE, .name = ZFS_DRIVER,