diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 21:36:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 21:36:59 -0400 |
| commit | 8397345172aa5cdcbc133977af9d525f45b874ea (patch) | |
| tree | 9b1077a62bbe06d20f1e49d1aa842db0435be085 /fs/btrfs | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
| parent | e6bc45d65df8599fdbae73be9cec4ceed274db53 (diff) | |
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
vfs: make unlink() and rmdir() return ENOENT in preference to EROFS
lmLogOpen() broken failure exit
usb: remove bad dput after dentry_unhash
more conservative S_NOSEC handling
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 117e74e3604b..0bb4ebbb71b7 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -825,7 +825,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, | |||
| 825 | } else { | 825 | } else { |
| 826 | char b[BDEVNAME_SIZE]; | 826 | char b[BDEVNAME_SIZE]; |
| 827 | 827 | ||
| 828 | s->s_flags = flags; | 828 | s->s_flags = flags | MS_NOSEC; |
| 829 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); | 829 | strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); |
| 830 | error = btrfs_fill_super(s, fs_devices, data, | 830 | error = btrfs_fill_super(s, fs_devices, data, |
| 831 | flags & MS_SILENT ? 1 : 0); | 831 | flags & MS_SILENT ? 1 : 0); |