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

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2009-03-11 10:43:47 -07:00
parent 2986e21763 8eaf19dae8
commit ab79e1e996
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/ztest.c
View File

@ -2496,7 +2496,7 @@ ztest_fault_inject(ztest_args_t *za)
int fd; int fd;
uint64_t offset; uint64_t offset;
uint64_t leaves = MAX(zopt_mirrors, 1) * zopt_raidz; uint64_t leaves = MAX(zopt_mirrors, 1) * zopt_raidz;
uint64_t bad = 0x1990c0ffeedecade; uint64_t bad = 0x1990c0ffeedecadeull;
uint64_t top, leaf; uint64_t top, leaf;
char path0[MAXPATHLEN]; char path0[MAXPATHLEN];
char pathrand[MAXPATHLEN]; char pathrand[MAXPATHLEN];

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

@ -46,17 +46,17 @@ extern "C" {
* Additional file level attributes, that are stored * Additional file level attributes, that are stored
* in the upper half of zp_flags * in the upper half of zp_flags
*/ */
#define ZFS_READONLY 0x0000000100000000 #define ZFS_READONLY 0x0000000100000000ull
#define ZFS_HIDDEN 0x0000000200000000 #define ZFS_HIDDEN 0x0000000200000000ull
#define ZFS_SYSTEM 0x0000000400000000 #define ZFS_SYSTEM 0x0000000400000000ull
#define ZFS_ARCHIVE 0x0000000800000000 #define ZFS_ARCHIVE 0x0000000800000000ull
#define ZFS_IMMUTABLE 0x0000001000000000 #define ZFS_IMMUTABLE 0x0000001000000000ull
#define ZFS_NOUNLINK 0x0000002000000000 #define ZFS_NOUNLINK 0x0000002000000000ull
#define ZFS_APPENDONLY 0x0000004000000000 #define ZFS_APPENDONLY 0x0000004000000000ull
#define ZFS_NODUMP 0x0000008000000000 #define ZFS_NODUMP 0x0000008000000000ull
#define ZFS_OPAQUE 0x0000010000000000 #define ZFS_OPAQUE 0x0000010000000000ull
#define ZFS_AV_QUARANTINED 0x0000020000000000 #define ZFS_AV_QUARANTINED 0x0000020000000000ull
#define ZFS_AV_MODIFIED 0x0000040000000000 #define ZFS_AV_MODIFIED 0x0000040000000000ull
#define ZFS_ATTR_SET(zp, attr, value) \ #define ZFS_ATTR_SET(zp, attr, value) \
{ \ { \