git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
super.c
diff --git
a/fs/btrfs/super.c
b/fs/btrfs/super.c
index 74e47794e63ffdda6921f8445bd4f576f22f1434..12540b6104b5d9269baf4b35de420eca930b15af 100644
(file)
--- a/
fs/btrfs/super.c
+++ b/
fs/btrfs/super.c
@@
-1154,7
+1154,6
@@
static int btrfs_fill_super(struct super_block *sb,
goto fail_close;
}
- save_mount_options(sb, data);
cleancache_init_fs(sb);
sb->s_flags |= MS_ACTIVE;
return 0;