diff --git a/[refs] b/[refs] index 934602f0fe89..f50f47651069 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 516f2e24faa7548a61d9ba790958528469c2e284 +refs/heads/master: fdc17abbc4b6094b34ee8ff5d91eaba8637594a2 diff --git a/trunk/fs/nfs/blocklayout/blocklayout.h b/trunk/fs/nfs/blocklayout/blocklayout.h index f27d827960a3..58dc256402e3 100644 --- a/trunk/fs/nfs/blocklayout/blocklayout.h +++ b/trunk/fs/nfs/blocklayout/blocklayout.h @@ -150,7 +150,7 @@ BLK_LSEG2EXT(struct pnfs_layout_segment *lseg) } struct bl_dev_msg { - int status; + int32_t status; uint32_t major, minor; };