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
303a8f2a
Commit
303a8f2a
authored
Nov 25, 2011
by
Cong Wang
Committed by
Cong Wang
Mar 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jbd2: remove the second argument of k[un]map_atomic()
Signed-off-by:
Cong Wang
<
amwang@redhat.com
>
parent
8fb53c46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
fs/jbd2/commit.c
fs/jbd2/commit.c
+2
-2
fs/jbd2/journal.c
fs/jbd2/journal.c
+6
-6
fs/jbd2/transaction.c
fs/jbd2/transaction.c
+2
-2
No files found.
fs/jbd2/commit.c
View file @
303a8f2a
...
@@ -286,10 +286,10 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
...
@@ -286,10 +286,10 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
char
*
addr
;
char
*
addr
;
__u32
checksum
;
__u32
checksum
;
addr
=
kmap_atomic
(
page
,
KM_USER0
);
addr
=
kmap_atomic
(
page
);
checksum
=
crc32_be
(
crc32_sum
,
checksum
=
crc32_be
(
crc32_sum
,
(
void
*
)(
addr
+
offset_in_page
(
bh
->
b_data
)),
bh
->
b_size
);
(
void
*
)(
addr
+
offset_in_page
(
bh
->
b_data
)),
bh
->
b_size
);
kunmap_atomic
(
addr
,
KM_USER0
);
kunmap_atomic
(
addr
);
return
checksum
;
return
checksum
;
}
}
...
...
fs/jbd2/journal.c
View file @
303a8f2a
...
@@ -345,7 +345,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
...
@@ -345,7 +345,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
new_offset
=
offset_in_page
(
jh2bh
(
jh_in
)
->
b_data
);
new_offset
=
offset_in_page
(
jh2bh
(
jh_in
)
->
b_data
);
}
}
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
/*
/*
* Fire data frozen trigger if data already wasn't frozen. Do this
* Fire data frozen trigger if data already wasn't frozen. Do this
* before checking for escaping, as the trigger may modify the magic
* before checking for escaping, as the trigger may modify the magic
...
@@ -364,7 +364,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
...
@@ -364,7 +364,7 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
need_copy_out
=
1
;
need_copy_out
=
1
;
do_escape
=
1
;
do_escape
=
1
;
}
}
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
/*
/*
* Do we need to do a data copy?
* Do we need to do a data copy?
...
@@ -385,9 +385,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
...
@@ -385,9 +385,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
}
}
jh_in
->
b_frozen_data
=
tmp
;
jh_in
->
b_frozen_data
=
tmp
;
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
memcpy
(
tmp
,
mapped_data
+
new_offset
,
jh2bh
(
jh_in
)
->
b_size
);
memcpy
(
tmp
,
mapped_data
+
new_offset
,
jh2bh
(
jh_in
)
->
b_size
);
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
new_page
=
virt_to_page
(
tmp
);
new_page
=
virt_to_page
(
tmp
);
new_offset
=
offset_in_page
(
tmp
);
new_offset
=
offset_in_page
(
tmp
);
...
@@ -406,9 +406,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
...
@@ -406,9 +406,9 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
* copying, we can finally do so.
* copying, we can finally do so.
*/
*/
if
(
do_escape
)
{
if
(
do_escape
)
{
mapped_data
=
kmap_atomic
(
new_page
,
KM_USER0
);
mapped_data
=
kmap_atomic
(
new_page
);
*
((
unsigned
int
*
)(
mapped_data
+
new_offset
))
=
0
;
*
((
unsigned
int
*
)(
mapped_data
+
new_offset
))
=
0
;
kunmap_atomic
(
mapped_data
,
KM_USER0
);
kunmap_atomic
(
mapped_data
);
}
}
set_bh_page
(
new_bh
,
new_page
,
new_offset
);
set_bh_page
(
new_bh
,
new_page
,
new_offset
);
...
...
fs/jbd2/transaction.c
View file @
303a8f2a
...
@@ -783,12 +783,12 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
...
@@ -783,12 +783,12 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
"Possible IO failure.
\n
"
);
"Possible IO failure.
\n
"
);
page
=
jh2bh
(
jh
)
->
b_page
;
page
=
jh2bh
(
jh
)
->
b_page
;
offset
=
offset_in_page
(
jh2bh
(
jh
)
->
b_data
);
offset
=
offset_in_page
(
jh2bh
(
jh
)
->
b_data
);
source
=
kmap_atomic
(
page
,
KM_USER0
);
source
=
kmap_atomic
(
page
);
/* Fire data frozen trigger just before we copy the data */
/* Fire data frozen trigger just before we copy the data */
jbd2_buffer_frozen_trigger
(
jh
,
source
+
offset
,
jbd2_buffer_frozen_trigger
(
jh
,
source
+
offset
,
jh
->
b_triggers
);
jh
->
b_triggers
);
memcpy
(
jh
->
b_frozen_data
,
source
+
offset
,
jh2bh
(
jh
)
->
b_size
);
memcpy
(
jh
->
b_frozen_data
,
source
+
offset
,
jh2bh
(
jh
)
->
b_size
);
kunmap_atomic
(
source
,
KM_USER0
);
kunmap_atomic
(
source
);
/*
/*
* Now that the frozen data is saved off, we need to store
* Now that the frozen data is saved off, we need to store
...
...
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