Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
cf590012
Commit
cf590012
authored
19 years ago
by
Linus Torvalds
Browse files
Options
Downloads
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
parents
65e4308d
e74589ac
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
fs/ntfs/ChangeLog
+3
-0
3 additions, 0 deletions
fs/ntfs/ChangeLog
fs/ntfs/mft.c
+2
-0
2 additions, 0 deletions
fs/ntfs/mft.c
with
5 additions
and
0 deletions
fs/ntfs/ChangeLog
+
3
−
0
View file @
cf590012
...
@@ -174,6 +174,9 @@ ToDo/Notes:
...
@@ -174,6 +174,9 @@ ToDo/Notes:
fact that the vfs and ntfs inodes are one struct in memory to find
fact that the vfs and ntfs inodes are one struct in memory to find
the ntfs inode in memory if present. Also, the ntfs inode has its
the ntfs inode in memory if present. Also, the ntfs inode has its
own locking so it does not matter if the vfs inode is locked.
own locking so it does not matter if the vfs inode is locked.
- Fix bug in mft record writing where we forgot to set the device in
the buffers when mapping them after the VM had discarded them
Thanks to Martin MOKREJŠ for the bug report.
2.1.22 - Many bug and race fixes and error handling improvements.
2.1.22 - Many bug and race fixes and error handling improvements.
...
...
This diff is collapsed.
Click to expand it.
fs/ntfs/mft.c
+
2
−
0
View file @
cf590012
...
@@ -533,6 +533,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
...
@@ -533,6 +533,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no,
LCN
lcn
;
LCN
lcn
;
unsigned
int
vcn_ofs
;
unsigned
int
vcn_ofs
;
bh
->
b_bdev
=
vol
->
sb
->
s_bdev
;
/* Obtain the vcn and offset of the current block. */
/* Obtain the vcn and offset of the current block. */
vcn
=
((
VCN
)
mft_no
<<
vol
->
mft_record_size_bits
)
+
vcn
=
((
VCN
)
mft_no
<<
vol
->
mft_record_size_bits
)
+
(
block_start
-
m_start
);
(
block_start
-
m_start
);
...
@@ -725,6 +726,7 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync)
...
@@ -725,6 +726,7 @@ int write_mft_record_nolock(ntfs_inode *ni, MFT_RECORD *m, int sync)
LCN
lcn
;
LCN
lcn
;
unsigned
int
vcn_ofs
;
unsigned
int
vcn_ofs
;
bh
->
b_bdev
=
vol
->
sb
->
s_bdev
;
/* Obtain the vcn and offset of the current block. */
/* Obtain the vcn and offset of the current block. */
vcn
=
((
VCN
)
ni
->
mft_no
<<
vol
->
mft_record_size_bits
)
+
vcn
=
((
VCN
)
ni
->
mft_no
<<
vol
->
mft_record_size_bits
)
+
(
block_start
-
m_start
);
(
block_start
-
m_start
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment