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

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

This commit is contained in:
Brian Behlendorf 2009-03-11 23:10:09 -07:00
parent 6f5aac6171 bd6bd87232
commit dd82a3b6bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zpool/zpool_vdev.c
View File

@ -283,11 +283,11 @@ check_file(const char *file, boolean_t force, boolean_t isspare)
char *name; char *name;
int fd; int fd;
int ret = 0; int ret = 0;
int err;
pool_state_t state; pool_state_t state;
boolean_t inuse; boolean_t inuse;
#ifdef HAVE_DM_INUSE_SWAP #ifdef HAVE_DM_INUSE_SWAP
int err;
if (dm_inuse_swap(file, &err)) { if (dm_inuse_swap(file, &err)) {
if (err) if (err)
libdiskmgt_error(err); libdiskmgt_error(err);