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
dacd0e7b
Commit
dacd0e7b
authored
Jul 26, 2011
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fat: propagate umode_t
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
d0c00d06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
fs/fat/fat.h
fs/fat/fat.h
+3
-3
fs/fat/file.c
fs/fat/file.c
+2
-2
No files found.
fs/fat/fat.h
View file @
dacd0e7b
...
...
@@ -141,7 +141,7 @@ static inline struct msdos_inode_info *MSDOS_I(struct inode *inode)
static
inline
int
fat_mode_can_hold_ro
(
struct
inode
*
inode
)
{
struct
msdos_sb_info
*
sbi
=
MSDOS_SB
(
inode
->
i_sb
);
mode_t
mask
;
u
mode_t
mask
;
if
(
S_ISDIR
(
inode
->
i_mode
))
{
if
(
!
sbi
->
options
.
rodir
)
...
...
@@ -156,8 +156,8 @@ static inline int fat_mode_can_hold_ro(struct inode *inode)
}
/* Convert attribute bits and a mask to the UNIX mode. */
static
inline
mode_t
fat_make_mode
(
struct
msdos_sb_info
*
sbi
,
u8
attrs
,
mode_t
mode
)
static
inline
u
mode_t
fat_make_mode
(
struct
msdos_sb_info
*
sbi
,
u8
attrs
,
u
mode_t
mode
)
{
if
(
attrs
&
ATTR_RO
&&
!
((
attrs
&
ATTR_DIR
)
&&
!
sbi
->
options
.
rodir
))
mode
&=
~
S_IWUGO
;
...
...
fs/fat/file.c
View file @
dacd0e7b
...
...
@@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(fat_getattr);
static
int
fat_sanitize_mode
(
const
struct
msdos_sb_info
*
sbi
,
struct
inode
*
inode
,
umode_t
*
mode_ptr
)
{
mode_t
mask
,
perm
;
u
mode_t
mask
,
perm
;
/*
* Note, the basic check is already done by a caller of
...
...
@@ -351,7 +351,7 @@ static int fat_sanitize_mode(const struct msdos_sb_info *sbi,
static
int
fat_allow_set_time
(
struct
msdos_sb_info
*
sbi
,
struct
inode
*
inode
)
{
mode_t
allow_utime
=
sbi
->
options
.
allow_utime
;
u
mode_t
allow_utime
=
sbi
->
options
.
allow_utime
;
if
(
current_fsuid
()
!=
inode
->
i_uid
)
{
if
(
in_group_p
(
inode
->
i_gid
))
...
...
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