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
nexedi
linux
Commits
237c03ea
Commit
237c03ea
authored
Feb 27, 2002
by
Alexander Viro
Committed by
Linus Torvalds
Feb 27, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] (7/7) kdev_t removals
* minor cleanup in jffs (passing superblock instead of ->[si]_dev).
parent
94982b1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
fs/jffs/intrep.c
fs/jffs/intrep.c
+6
-8
No files found.
fs/jffs/intrep.c
View file @
237c03ea
...
@@ -428,7 +428,7 @@ jffs_create_file(struct jffs_control *c,
...
@@ -428,7 +428,7 @@ jffs_create_file(struct jffs_control *c,
/* Build a control block for the file system. */
/* Build a control block for the file system. */
static
struct
jffs_control
*
static
struct
jffs_control
*
jffs_create_control
(
kdev_t
dev
)
jffs_create_control
(
struct
super_block
*
sb
)
{
{
struct
jffs_control
*
c
;
struct
jffs_control
*
c
;
register
int
s
=
sizeof
(
struct
jffs_control
);
register
int
s
=
sizeof
(
struct
jffs_control
);
...
@@ -451,7 +451,7 @@ jffs_create_control(kdev_t dev)
...
@@ -451,7 +451,7 @@ jffs_create_control(kdev_t dev)
DJM
(
no_hash
++
);
DJM
(
no_hash
++
);
for
(
i
=
0
;
i
<
c
->
hash_len
;
i
++
)
for
(
i
=
0
;
i
<
c
->
hash_len
;
i
++
)
INIT_LIST_HEAD
(
&
c
->
hash
[
i
]);
INIT_LIST_HEAD
(
&
c
->
hash
[
i
]);
if
(
!
(
c
->
fmc
=
jffs_build_begin
(
c
,
dev
)))
{
if
(
!
(
c
->
fmc
=
jffs_build_begin
(
c
,
sb
->
s_
dev
)))
{
goto
fail_fminit
;
goto
fail_fminit
;
}
}
c
->
next_ino
=
JFFS_MIN_INO
+
1
;
c
->
next_ino
=
JFFS_MIN_INO
+
1
;
...
@@ -549,7 +549,7 @@ jffs_build_fs(struct super_block *sb)
...
@@ -549,7 +549,7 @@ jffs_build_fs(struct super_block *sb)
D2
(
printk
(
"jffs_build_fs()
\n
"
));
D2
(
printk
(
"jffs_build_fs()
\n
"
));
if
(
!
(
c
=
jffs_create_control
(
sb
->
s_dev
)))
{
if
(
!
(
c
=
jffs_create_control
(
sb
)))
{
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
c
->
building_fs
=
1
;
c
->
building_fs
=
1
;
...
@@ -563,7 +563,7 @@ jffs_build_fs(struct super_block *sb)
...
@@ -563,7 +563,7 @@ jffs_build_fs(struct super_block *sb)
D1
(
printk
(
"jffs_build_fs: Cleaning up all control structures,"
D1
(
printk
(
"jffs_build_fs: Cleaning up all control structures,"
" reallocating them and trying mount again.
\n
"
));
" reallocating them and trying mount again.
\n
"
));
jffs_cleanup_control
(
c
);
jffs_cleanup_control
(
c
);
if
(
!
(
c
=
jffs_create_control
(
sb
->
s_dev
)))
{
if
(
!
(
c
=
jffs_create_control
(
sb
)))
{
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
c
->
building_fs
=
1
;
c
->
building_fs
=
1
;
...
@@ -1932,8 +1932,7 @@ jffs_write_node(struct jffs_control *c, struct jffs_node *node,
...
@@ -1932,8 +1932,7 @@ jffs_write_node(struct jffs_control *c, struct jffs_node *node,
the buffer. */
the buffer. */
static
int
static
int
jffs_get_node_data
(
struct
jffs_file
*
f
,
struct
jffs_node
*
node
,
jffs_get_node_data
(
struct
jffs_file
*
f
,
struct
jffs_node
*
node
,
unsigned
char
*
buf
,
__u32
node_offset
,
__u32
max_size
,
unsigned
char
*
buf
,
__u32
node_offset
,
__u32
max_size
)
kdev_t
dev
)
{
{
struct
jffs_fmcontrol
*
fmc
=
f
->
c
->
fmc
;
struct
jffs_fmcontrol
*
fmc
=
f
->
c
->
fmc
;
__u32
pos
=
node
->
fm
->
offset
+
node
->
fm_offset
+
node_offset
;
__u32
pos
=
node
->
fm
->
offset
+
node
->
fm_offset
+
node_offset
;
...
@@ -2003,8 +2002,7 @@ jffs_read_data(struct jffs_file *f, unsigned char *buf, __u32 read_offset,
...
@@ -2003,8 +2002,7 @@ jffs_read_data(struct jffs_file *f, unsigned char *buf, __u32 read_offset,
}
}
else
if
((
r
=
jffs_get_node_data
(
f
,
node
,
&
buf
[
read_data
],
else
if
((
r
=
jffs_get_node_data
(
f
,
node
,
&
buf
[
read_data
],
node_offset
,
node_offset
,
size
-
read_data
,
size
-
read_data
))
<
0
)
{
f
->
c
->
sb
->
s_dev
))
<
0
)
{
return
r
;
return
r
;
}
}
read_data
+=
r
;
read_data
+=
r
;
...
...
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