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

Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

This commit is contained in:
Brian Behlendorf 2009-12-18 14:31:51 -08:00
parent 523c030016 1a36b0ada1
commit 5b0a1c06d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/zfs/dmu_send.c
View File

@ -689,7 +689,7 @@ restore_read(struct restorearg *ra, int len)
return (rv); return (rv);
} }
static void noinline static void
backup_byteswap(dmu_replay_record_t *drr) backup_byteswap(dmu_replay_record_t *drr)
{ {
#define DO64(X) (drr->drr_u.X = BSWAP_64(drr->drr_u.X)) #define DO64(X) (drr->drr_u.X = BSWAP_64(drr->drr_u.X))
@ -740,7 +740,7 @@ backup_byteswap(dmu_replay_record_t *drr)
#undef DO32 #undef DO32
} }
static int noinline static int
restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro) restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro)
{ {
int err; int err;
@ -822,7 +822,7 @@ restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro)
} }
/* ARGSUSED */ /* ARGSUSED */
static int noinline static int
restore_freeobjects(struct restorearg *ra, objset_t *os, restore_freeobjects(struct restorearg *ra, objset_t *os,
struct drr_freeobjects *drrfo) struct drr_freeobjects *drrfo)
{ {
@ -846,7 +846,7 @@ restore_freeobjects(struct restorearg *ra, objset_t *os,
return (0); return (0);
} }
static int noinline static int
restore_write(struct restorearg *ra, objset_t *os, restore_write(struct restorearg *ra, objset_t *os,
struct drr_write *drrw) struct drr_write *drrw)
{ {
@ -883,7 +883,7 @@ restore_write(struct restorearg *ra, objset_t *os,
} }
/* ARGSUSED */ /* ARGSUSED */
static int noinline static int
restore_free(struct restorearg *ra, objset_t *os, restore_free(struct restorearg *ra, objset_t *os,
struct drr_free *drrf) struct drr_free *drrf)
{ {