summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-12-26 01:12:35 +0000
committerpfg <pfg@FreeBSD.org>2013-12-26 01:12:35 +0000
commita53893ff4d6435910c3633aa124442f17b37e9f0 (patch)
tree247681727eef3f29f1b19e6c60f8e3f598d2d61c
parent5d40dd365f740e3367f60e852aeef11945bc1f61 (diff)
downloadFreeBSD-src-a53893ff4d6435910c3633aa124442f17b37e9f0.zip
FreeBSD-src-a53893ff4d6435910c3633aa124442f17b37e9f0.tar.gz
MFC r258904, r259780:
Small ext2fs updates. Add two new reserved inodes. Make the hashing algorithm match the linux code. PR: kern/183230
-rw-r--r--sys/fs/ext2fs/ext2_dinode.h2
-rw-r--r--sys/fs/ext2fs/ext2_hash.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/fs/ext2fs/ext2_dinode.h b/sys/fs/ext2fs/ext2_dinode.h
index e492a08..41b0236 100644
--- a/sys/fs/ext2fs/ext2_dinode.h
+++ b/sys/fs/ext2fs/ext2_dinode.h
@@ -44,6 +44,8 @@
#define EXT2_UNDELDIRINO ((ino_t)6)
#define EXT2_RESIZEINO ((ino_t)7)
#define EXT2_JOURNALINO ((ino_t)8)
+#define EXT2_EXCLUDEINO ((ino_t)9)
+#define EXT2_REPLICAINO ((ino_t)10)
#define EXT2_FIRSTINO ((ino_t)11)
/*
diff --git a/sys/fs/ext2fs/ext2_hash.c b/sys/fs/ext2fs/ext2_hash.c
index 85849b0..50a3811 100644
--- a/sys/fs/ext2fs/ext2_hash.c
+++ b/sys/fs/ext2fs/ext2_hash.c
@@ -289,8 +289,8 @@ ext2_htree_hash(const char *name, int len,
len -= 32;
name += 32;
}
- major = hash[0];
- minor = hash[1];
+ major = hash[1];
+ minor = hash[2];
break;
default:
goto error;
OpenPOWER on IntegriCloud