diff options
Diffstat (limited to 'fs/fat/file.c')
-rw-r--r-- | fs/fat/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index c118acf16e43..a71fe3715ee8 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
@@ -44,7 +44,7 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr) | |||
44 | goto out; | 44 | goto out; |
45 | 45 | ||
46 | mutex_lock(&inode->i_mutex); | 46 | mutex_lock(&inode->i_mutex); |
47 | err = mnt_want_write(file->f_path.mnt); | 47 | err = mnt_want_write_file(file); |
48 | if (err) | 48 | if (err) |
49 | goto out_unlock_inode; | 49 | goto out_unlock_inode; |
50 | 50 | ||
@@ -108,7 +108,7 @@ static int fat_ioctl_set_attributes(struct file *file, u32 __user *user_attr) | |||
108 | fat_save_attrs(inode, attr); | 108 | fat_save_attrs(inode, attr); |
109 | mark_inode_dirty(inode); | 109 | mark_inode_dirty(inode); |
110 | out_drop_write: | 110 | out_drop_write: |
111 | mnt_drop_write(file->f_path.mnt); | 111 | mnt_drop_write_file(file); |
112 | out_unlock_inode: | 112 | out_unlock_inode: |
113 | mutex_unlock(&inode->i_mutex); | 113 | mutex_unlock(&inode->i_mutex); |
114 | out: | 114 | out: |
@@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(fat_getattr); | |||
314 | static int fat_sanitize_mode(const struct msdos_sb_info *sbi, | 314 | static int fat_sanitize_mode(const struct msdos_sb_info *sbi, |
315 | struct inode *inode, umode_t *mode_ptr) | 315 | struct inode *inode, umode_t *mode_ptr) |
316 | { | 316 | { |
317 | mode_t mask, perm; | 317 | umode_t mask, perm; |
318 | 318 | ||
319 | /* | 319 | /* |
320 | * Note, the basic check is already done by a caller of | 320 | * 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, | |||
351 | 351 | ||
352 | static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) | 352 | static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode) |
353 | { | 353 | { |
354 | mode_t allow_utime = sbi->options.allow_utime; | 354 | umode_t allow_utime = sbi->options.allow_utime; |
355 | 355 | ||
356 | if (current_fsuid() != inode->i_uid) { | 356 | if (current_fsuid() != inode->i_uid) { |
357 | if (in_group_p(inode->i_gid)) | 357 | if (in_group_p(inode->i_gid)) |