Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333698
b: refs/heads/master
c: f6e12dc
h: refs/heads/master
v: v3
  • Loading branch information
Marco Stornelli authored and Al Viro committed Oct 10, 2012
1 parent 92bd637 commit c00f026
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e40b34c7921534a46f7bae23ec6646d3d9c2c7b2
refs/heads/master: f6e12dc4fc6f78745fd48a24ff2f06efb0bdeb0d
3 changes: 0 additions & 3 deletions trunk/fs/hpfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)
*flags |= MS_NOATIME;

hpfs_lock(s);
lock_super(s);
uid = sbi->sb_uid; gid = sbi->sb_gid;
umask = 0777 & ~sbi->sb_mode;
lowercase = sbi->sb_lowercase;
Expand Down Expand Up @@ -431,12 +430,10 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data)

replace_mount_options(s, new_opts);

unlock_super(s);
hpfs_unlock(s);
return 0;

out_err:
unlock_super(s);
hpfs_unlock(s);
kfree(new_opts);
return -EINVAL;
Expand Down

0 comments on commit c00f026

Please sign in to comment.