aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorplougher <plougher>2008-10-28 00:13:12 +0000
committerMohamad Ayyash <mkayyash@google.com>2015-02-23 12:34:09 -0800
commit183b4ee6320030ce1bd8980757c42071779973bc (patch)
tree49abefe2fbb4ab3d193f365ccae20a63531008ac /kernel
parentb63b792093114e8e58d4232ce14408d1b80a4b63 (diff)
downloadsquashfs-tools-183b4ee6320030ce1bd8980757c42071779973bc.tar.gz
Rename SQUASHFS_FILE_TYPE to SQUASHFS_REG_TYPE, to conform to
SQUASHFS_LREG_TYPE and S_IFREG definition
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fs/squashfs/inode.c2
-rw-r--r--kernel/include/linux/squashfs_fs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fs/squashfs/inode.c b/kernel/fs/squashfs/inode.c
index a584db2..e1cd17d 100644
--- a/kernel/fs/squashfs/inode.c
+++ b/kernel/fs/squashfs/inode.c
@@ -132,7 +132,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
type = le16_to_cpu(sqshb_ino->inode_type);
switch (type) {
- case SQUASHFS_FILE_TYPE: {
+ case SQUASHFS_REG_TYPE: {
unsigned int frag_offset, frag_size, frag;
long long frag_blk;
struct squashfs_reg_inode *sqsh_ino = &squashfs_ino.reg;
diff --git a/kernel/include/linux/squashfs_fs.h b/kernel/include/linux/squashfs_fs.h
index 97f4877..eef85b1 100644
--- a/kernel/include/linux/squashfs_fs.h
+++ b/kernel/include/linux/squashfs_fs.h
@@ -82,7 +82,7 @@
/* Max number of types and file types */
#define SQUASHFS_DIR_TYPE 1
-#define SQUASHFS_FILE_TYPE 2
+#define SQUASHFS_REG_TYPE 2
#define SQUASHFS_SYMLINK_TYPE 3
#define SQUASHFS_BLKDEV_TYPE 4
#define SQUASHFS_CHRDEV_TYPE 5