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
f8534f75
Commit
f8534f75
authored
Mar 12, 2002
by
Alexander Viro
Committed by
Linus Torvalds
Mar 12, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] removal of ->u.romfs_i
parent
886fdc3a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
18 deletions
+15
-18
fs/romfs/inode.c
fs/romfs/inode.c
+15
-4
include/linux/fs.h
include/linux/fs.h
+0
-3
include/linux/romfs_fs_i.h
include/linux/romfs_fs_i.h
+0
-11
No files found.
fs/romfs/inode.c
View file @
f8534f75
...
...
@@ -76,6 +76,17 @@
#include <asm/uaccess.h>
struct
romfs_inode_info
{
unsigned
long
i_metasize
;
/* size of non-data area */
unsigned
long
i_dataoffset
;
/* from the start of fs */
struct
inode
vfs_inode
;
};
static
inline
struct
romfs_inode_info
*
ROMFS_I
(
struct
inode
*
inode
)
{
return
list_entry
(
inode
,
struct
romfs_inode_info
,
vfs_inode
);
}
static
__s32
romfs_checksum
(
void
*
data
,
int
size
)
{
...
...
@@ -407,7 +418,7 @@ romfs_readpage(struct file *file, struct page * page)
if
(
offset
<
inode
->
i_size
)
{
avail
=
inode
->
i_size
-
offset
;
readlen
=
min_t
(
unsigned
long
,
avail
,
PAGE_SIZE
);
if
(
romfs_copyfrom
(
inode
,
buf
,
inode
->
u
.
romfs_i
.
i_dataoffset
+
offset
,
readlen
)
==
readlen
)
{
if
(
romfs_copyfrom
(
inode
,
buf
,
ROMFS_I
(
inode
)
->
i_dataoffset
+
offset
,
readlen
)
==
readlen
)
{
if
(
readlen
<
PAGE_SIZE
)
{
memset
(
buf
+
readlen
,
0
,
PAGE_SIZE
-
readlen
);
}
...
...
@@ -488,15 +499,15 @@ romfs_read_inode(struct inode *i)
else
ino
=
0
;
i
->
u
.
romfs_i
.
i_metasize
=
ino
;
i
->
u
.
romfs_i
.
i_dataoffset
=
ino
+
(
i
->
i_ino
&
ROMFH_MASK
);
ROMFS_I
(
i
)
->
i_metasize
=
ino
;
ROMFS_I
(
i
)
->
i_dataoffset
=
ino
+
(
i
->
i_ino
&
ROMFH_MASK
);
/* Compute permissions */
ino
=
romfs_modemap
[
nextfh
&
ROMFH_TYPE
];
/* only "normal" files have ops */
switch
(
nextfh
&
ROMFH_TYPE
)
{
case
1
:
i
->
i_size
=
i
->
u
.
romfs_i
.
i_metasize
;
i
->
i_size
=
ROMFS_I
(
i
)
->
i_metasize
;
i
->
i_op
=
&
romfs_dir_inode_operations
;
i
->
i_fop
=
&
romfs_dir_operations
;
if
(
nextfh
&
ROMFH_EXEC
)
...
...
include/linux/fs.h
View file @
f8534f75
...
...
@@ -289,7 +289,6 @@ extern void set_bh_page(struct buffer_head *bh, struct page *page, unsigned long
#include <linux/pipe_fs_i.h>
/* #include <linux/umsdos_fs_i.h> */
#include <linux/romfs_fs_i.h>
/*
* Attribute flags. These should be or-ed together to figure out what
...
...
@@ -453,8 +452,6 @@ struct inode {
unsigned
int
i_attr_flags
;
__u32
i_generation
;
union
{
/* struct umsdos_inode_info umsdos_i; */
struct
romfs_inode_info
romfs_i
;
void
*
generic_ip
;
}
u
;
};
...
...
include/linux/romfs_fs_i.h
deleted
100644 → 0
View file @
886fdc3a
#ifndef __ROMFS_FS_I
#define __ROMFS_FS_I
/* inode in-kernel data */
struct
romfs_inode_info
{
unsigned
long
i_metasize
;
/* size of non-data area */
unsigned
long
i_dataoffset
;
/* from the start of fs */
};
#endif
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