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
0661c4a9
Commit
0661c4a9
authored
Oct 28, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://jfs.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
d81bc5d7
58df8b02
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
fs/jfs/xattr.c
fs/jfs/xattr.c
+3
-2
No files found.
fs/jfs/xattr.c
View file @
0661c4a9
...
@@ -303,7 +303,7 @@ static int ea_write(struct inode *ip, struct jfs_ea_list *ealist, int size,
...
@@ -303,7 +303,7 @@ static int ea_write(struct inode *ip, struct jfs_ea_list *ealist, int size,
}
}
ea
->
flag
=
DXD_EXTENT
;
ea
->
flag
=
DXD_EXTENT
;
DXDsize
(
ea
,
ealist
->
size
);
DXDsize
(
ea
,
le32_to_cpu
(
ealist
->
size
)
);
DXDlength
(
ea
,
nblocks
);
DXDlength
(
ea
,
nblocks
);
DXDaddress
(
ea
,
blkno
);
DXDaddress
(
ea
,
blkno
);
...
@@ -342,7 +342,8 @@ static int ea_read_inline(struct inode *ip, struct jfs_ea_list *ealist)
...
@@ -342,7 +342,8 @@ static int ea_read_inline(struct inode *ip, struct jfs_ea_list *ealist)
/* Sanity Check */
/* Sanity Check */
if
((
sizeDXD
(
&
ji
->
ea
)
>
sizeof
(
ji
->
i_inline_ea
)))
if
((
sizeDXD
(
&
ji
->
ea
)
>
sizeof
(
ji
->
i_inline_ea
)))
return
-
EIO
;
return
-
EIO
;
if
(((
struct
jfs_ea_list
*
)
&
ji
->
i_inline_ea
)
->
size
!=
ea_size
)
if
(
le32_to_cpu
(((
struct
jfs_ea_list
*
)
&
ji
->
i_inline_ea
)
->
size
)
!=
ea_size
)
return
-
EIO
;
return
-
EIO
;
memcpy
(
ealist
,
ji
->
i_inline_ea
,
ea_size
);
memcpy
(
ealist
,
ji
->
i_inline_ea
,
ea_size
);
...
...
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