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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[sfrench/cifs-2.6.git]
/
fs
/
ubifs
/
super.c
diff --git
a/fs/ubifs/super.c
b/fs/ubifs/super.c
index 7503e7cdf8702a61ce91576316bfce10bd63e113..0beb285b143da6cfe9cc238ede64313f8f75a604 100644
(file)
--- a/
fs/ubifs/super.c
+++ b/
fs/ubifs/super.c
@@
-968,7
+968,7
@@
static int parse_standard_option(const char *option)
pr_notice("UBIFS: parse %s\n", option);
if (!strcmp(option, "sync"))
pr_notice("UBIFS: parse %s\n", option);
if (!strcmp(option, "sync"))
- return
MS
_SYNCHRONOUS;
+ return
SB
_SYNCHRONOUS;
return 0;
}
return 0;
}
@@
-1160,8
+1160,8
@@
static int mount_ubifs(struct ubifs_info *c)
size_t sz;
c->ro_mount = !!sb_rdonly(c->vfs_sb);
size_t sz;
c->ro_mount = !!sb_rdonly(c->vfs_sb);
- /* Suppress error messages while probing if
MS
_SILENT is set */
- c->probing = !!(c->vfs_sb->s_flags &
MS
_SILENT);
+ /* Suppress error messages while probing if
SB
_SILENT is set */
+ c->probing = !!(c->vfs_sb->s_flags &
SB
_SILENT);
err = init_constants_early(c);
if (err)
err = init_constants_early(c);
if (err)
@@
-1852,7
+1852,7
@@
static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
return err;
}
return err;
}
- if (c->ro_mount && !(*flags &
MS
_RDONLY)) {
+ if (c->ro_mount && !(*flags &
SB
_RDONLY)) {
if (c->ro_error) {
ubifs_msg(c, "cannot re-mount R/W due to prior errors");
return -EROFS;
if (c->ro_error) {
ubifs_msg(c, "cannot re-mount R/W due to prior errors");
return -EROFS;
@@
-1864,7
+1864,7
@@
static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data)
err = ubifs_remount_rw(c);
if (err)
return err;
err = ubifs_remount_rw(c);
if (err)
return err;
- } else if (!c->ro_mount && (*flags &
MS
_RDONLY)) {
+ } else if (!c->ro_mount && (*flags &
SB
_RDONLY)) {
if (c->ro_error) {
ubifs_msg(c, "cannot re-mount R/O due to prior errors");
return -EROFS;
if (c->ro_error) {
ubifs_msg(c, "cannot re-mount R/O due to prior errors");
return -EROFS;
@@
-2117,7
+2117,7
@@
static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
*/
ubi = open_ubi(name, UBI_READONLY);
if (IS_ERR(ubi)) {
*/
ubi = open_ubi(name, UBI_READONLY);
if (IS_ERR(ubi)) {
- if (!(flags &
MS
_SILENT))
+ if (!(flags &
SB
_SILENT))
pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
current->pid, name, (int)PTR_ERR(ubi));
return ERR_CAST(ubi);
pr_err("UBIFS error (pid: %d): cannot open \"%s\", error %d",
current->pid, name, (int)PTR_ERR(ubi));
return ERR_CAST(ubi);
@@
-2143,18
+2143,18
@@
static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
kfree(c);
/* A new mount point for already mounted UBIFS */
dbg_gen("this ubi volume is already mounted");
kfree(c);
/* A new mount point for already mounted UBIFS */
dbg_gen("this ubi volume is already mounted");
- if (!!(flags &
MS
_RDONLY) != c1->ro_mount) {
+ if (!!(flags &
SB
_RDONLY) != c1->ro_mount) {
err = -EBUSY;
goto out_deact;
}
} else {
err = -EBUSY;
goto out_deact;
}
} else {
- err = ubifs_fill_super(sb, data, flags &
MS
_SILENT ? 1 : 0);
+ err = ubifs_fill_super(sb, data, flags &
SB
_SILENT ? 1 : 0);
if (err)
goto out_deact;
/* We do not support atime */
if (err)
goto out_deact;
/* We do not support atime */
- sb->s_flags |=
MS
_ACTIVE;
+ sb->s_flags |=
SB
_ACTIVE;
#ifndef CONFIG_UBIFS_ATIME_SUPPORT
#ifndef CONFIG_UBIFS_ATIME_SUPPORT
- sb->s_flags |=
MS
_NOATIME;
+ sb->s_flags |=
SB
_NOATIME;
#else
ubifs_msg(c, "full atime support is enabled.");
#endif
#else
ubifs_msg(c, "full atime support is enabled.");
#endif