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
c3242291
Commit
c3242291
authored
Sep 12, 2005
by
Anton Altaparmakov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of imp.csi.cam.ac.uk:/home/src/ntfs-2.6.git/
parents
1df5c10a
89ecf38c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
fs/ntfs/ChangeLog
fs/ntfs/ChangeLog
+5
-4
fs/ntfs/malloc.h
fs/ntfs/malloc.h
+1
-1
fs/ntfs/super.c
fs/ntfs/super.c
+11
-3
No files found.
fs/ntfs/ChangeLog
View file @
c3242291
...
...
@@ -34,9 +34,6 @@ ToDo/Notes:
journals with two different restart pages. We sanity check both and
either use the only sane one or the more recent one of the two in the
case that both are valid.
- Modify fs/ntfs/malloc.h::ntfs_malloc_nofs() to do the kmalloc() based
allocations with __GFP_HIGHMEM, analogous to how the vmalloc() based
allocations are done.
- Add fs/ntfs/malloc.h::ntfs_malloc_nofs_nofail() which is analogous to
ntfs_malloc_nofs() but it performs allocations with __GFP_NOFAIL and
hence cannot fail.
...
...
@@ -91,6 +88,10 @@ ToDo/Notes:
improve scalability.
- Minor fix to error handling and error message display in
fs/ntfs/aops.c::ntfs_prepare_nonresident_write().
- Change the mount options {u,f,d}mask to always parse the number as
an octal number to conform to how chmod(1) works, too. Thanks to
Giuseppe Bilotta and Horst von Brand for pointing out the errors of
my ways.
2.1.23 - Implement extension of resident files and make writing safe as well as
many bug fixes, cleanups, and enhancements...
...
...
fs/ntfs/malloc.h
View file @
c3242291
...
...
@@ -45,7 +45,7 @@ static inline void *__ntfs_malloc(unsigned long size,
if
(
likely
(
size
<=
PAGE_SIZE
))
{
BUG_ON
(
!
size
);
/* kmalloc() has per-CPU caches so is faster for now. */
return
kmalloc
(
PAGE_SIZE
,
gfp_mask
);
return
kmalloc
(
PAGE_SIZE
,
gfp_mask
&
~
__GFP_HIGHMEM
);
/* return (void *)__get_free_page(gfp_mask); */
}
if
(
likely
(
size
>>
PAGE_SHIFT
<
num_physpages
))
...
...
fs/ntfs/super.c
View file @
c3242291
...
...
@@ -126,6 +126,14 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
if (*v) \
goto needs_val; \
}
#define NTFS_GETOPT_OCTAL(option, variable) \
if (!strcmp(p, option)) { \
if (!v || !*v) \
goto needs_arg; \
variable = simple_strtoul(ov = v, &v, 8); \
if (*v) \
goto needs_val; \
}
#define NTFS_GETOPT_BOOL(option, variable) \
if (!strcmp(p, option)) { \
BOOL val; \
...
...
@@ -157,9 +165,9 @@ static BOOL parse_options(ntfs_volume *vol, char *opt)
*
v
++
=
0
;
NTFS_GETOPT
(
"uid"
,
uid
)
else
NTFS_GETOPT
(
"gid"
,
gid
)
else
NTFS_GETOPT
(
"umask"
,
fmask
=
dmask
)
else
NTFS_GETOPT
(
"fmask"
,
fmask
)
else
NTFS_GETOPT
(
"dmask"
,
dmask
)
else
NTFS_GETOPT
_OCTAL
(
"umask"
,
fmask
=
dmask
)
else
NTFS_GETOPT
_OCTAL
(
"fmask"
,
fmask
)
else
NTFS_GETOPT
_OCTAL
(
"dmask"
,
dmask
)
else
NTFS_GETOPT
(
"mft_zone_multiplier"
,
mft_zone_multiplier
)
else
NTFS_GETOPT_WITH_DEFAULT
(
"sloppy"
,
sloppy
,
TRUE
)
else
NTFS_GETOPT_BOOL
(
"show_sys_files"
,
show_sys_files
)
...
...
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