Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f7f4f4dd
Commit
f7f4f4dd
authored
Dec 10, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cramfs: take headers to fs/cramfs
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
2309fb8e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
35 deletions
+23
-35
arch/blackfin/kernel/setup.c
arch/blackfin/kernel/setup.c
+1
-1
arch/cris/arch-v32/drivers/axisflashmap.c
arch/cris/arch-v32/drivers/axisflashmap.c
+0
-2
fs/cramfs/inode.c
fs/cramfs/inode.c
+20
-4
fs/cramfs/internal.h
fs/cramfs/internal.h
+0
-6
fs/cramfs/uncompress.c
fs/cramfs/uncompress.c
+1
-1
include/linux/cramfs_fs_sb.h
include/linux/cramfs_fs_sb.h
+0
-20
init/do_mounts_rd.c
init/do_mounts_rd.c
+1
-1
No files found.
arch/blackfin/kernel/setup.c
View file @
f7f4f4dd
...
...
@@ -17,7 +17,7 @@
#ifdef CONFIG_MTD_UCLINUX
#include <linux/mtd/map.h>
#include <linux/ext2_fs.h>
#include <linux/cramfs_fs.h>
#include <
uapi/
linux/cramfs_fs.h>
#include <linux/romfs_fs.h>
#endif
...
...
arch/cris/arch-v32/drivers/axisflashmap.c
View file @
f7f4f4dd
...
...
@@ -24,8 +24,6 @@
#include <linux/mtd/mtdram.h>
#include <linux/mtd/partitions.h>
#include <linux/cramfs_fs.h>
#include <asm/axisflashmap.h>
#include <asm/mmu.h>
...
...
fs/cramfs/inode.c
View file @
f7f4f4dd
...
...
@@ -17,14 +17,30 @@
#include <linux/init.h>
#include <linux/string.h>
#include <linux/blkdev.h>
#include <linux/cramfs_fs.h>
#include <linux/slab.h>
#include <linux/cramfs_fs_sb.h>
#include <linux/vfs.h>
#include <linux/mutex.h>
#include <uapi/linux/cramfs_fs.h>
#include <asm/uaccess.h>
#include "internal.h"
/*
* cramfs super-block data in memory
*/
struct
cramfs_sb_info
{
unsigned
long
magic
;
unsigned
long
size
;
unsigned
long
blocks
;
unsigned
long
files
;
unsigned
long
flags
;
};
static
inline
struct
cramfs_sb_info
*
CRAMFS_SB
(
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
static
const
struct
super_operations
cramfs_ops
;
static
const
struct
inode_operations
cramfs_dir_inode_operations
;
static
const
struct
file_operations
cramfs_directory_operations
;
...
...
@@ -221,7 +237,7 @@ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
static
void
cramfs_kill_sb
(
struct
super_block
*
sb
)
{
struct
cramfs_sb_info
*
sbi
=
sb
->
s_fs_info
;
struct
cramfs_sb_info
*
sbi
=
CRAMFS_SB
(
sb
)
;
kill_block_super
(
sb
);
kfree
(
sbi
);
}
...
...
include/linux/cramfs_fs
.h
→
fs/cramfs/internal
.h
View file @
f7f4f4dd
#ifndef __CRAMFS_H
#define __CRAMFS_H
#include <uapi/linux/cramfs_fs.h>
/* Uncompression interfaces to the underlying zlib */
int
cramfs_uncompress_block
(
void
*
dst
,
int
dstlen
,
void
*
src
,
int
srclen
);
int
cramfs_uncompress_init
(
void
);
void
cramfs_uncompress_exit
(
void
);
#endif
fs/cramfs/uncompress.c
View file @
f7f4f4dd
...
...
@@ -19,7 +19,7 @@
#include <linux/errno.h>
#include <linux/vmalloc.h>
#include <linux/zlib.h>
#include
<linux/cramfs_fs.h>
#include
"internal.h"
static
z_stream
stream
;
static
int
initialized
;
...
...
include/linux/cramfs_fs_sb.h
deleted
100644 → 0
View file @
2309fb8e
#ifndef _CRAMFS_FS_SB
#define _CRAMFS_FS_SB
/*
* cramfs super-block data in memory
*/
struct
cramfs_sb_info
{
unsigned
long
magic
;
unsigned
long
size
;
unsigned
long
blocks
;
unsigned
long
files
;
unsigned
long
flags
;
};
static
inline
struct
cramfs_sb_info
*
CRAMFS_SB
(
struct
super_block
*
sb
)
{
return
sb
->
s_fs_info
;
}
#endif
init/do_mounts_rd.c
View file @
f7f4f4dd
...
...
@@ -13,7 +13,7 @@
#include <linux/minix_fs.h>
#include <linux/ext2_fs.h>
#include <linux/romfs_fs.h>
#include <linux/cramfs_fs.h>
#include <
uapi/
linux/cramfs_fs.h>
#include <linux/initrd.h>
#include <linux/string.h>
#include <linux/slab.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment