git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
hfsplus
/
options.c
diff --git
a/fs/hfsplus/options.c
b/fs/hfsplus/options.c
index
572628b
..
f9ab276
100644
(file)
--- a/
fs/hfsplus/options.c
+++ b/
fs/hfsplus/options.c
@@
-143,13
+143,13
@@
int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
kfree(p);
break;
case opt_decompose:
kfree(p);
break;
case opt_decompose:
-
sbi->flags &= ~HFSPLUS_SB_NODECOMPOSE
;
+
clear_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags)
;
break;
case opt_nodecompose:
break;
case opt_nodecompose:
- s
bi->flags |= HFSPLUS_SB_NODECOMPOSE
;
+ s
et_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags)
;
break;
case opt_force:
break;
case opt_force:
- s
bi->flags |= HFSPLUS_SB_FORCE
;
+ s
et_bit(HFSPLUS_SB_FORCE, &sbi->flags)
;
break;
default:
return 0;
break;
default:
return 0;
@@
-171,7
+171,7
@@
done:
int hfsplus_show_options(struct seq_file *seq, struct vfsmount *mnt)
{
int hfsplus_show_options(struct seq_file *seq, struct vfsmount *mnt)
{
- struct hfsplus_sb_info *sbi =
&
HFSPLUS_SB(mnt->mnt_sb);
+ struct hfsplus_sb_info *sbi = HFSPLUS_SB(mnt->mnt_sb);
if (sbi->creator != HFSPLUS_DEF_CR_TYPE)
seq_printf(seq, ",creator=%.4s", (char *)&sbi->creator);
if (sbi->creator != HFSPLUS_DEF_CR_TYPE)
seq_printf(seq, ",creator=%.4s", (char *)&sbi->creator);
@@
-184,7
+184,7
@@
int hfsplus_show_options(struct seq_file *seq, struct vfsmount *mnt)
seq_printf(seq, ",session=%u", sbi->session);
if (sbi->nls)
seq_printf(seq, ",nls=%s", sbi->nls->charset);
seq_printf(seq, ",session=%u", sbi->session);
if (sbi->nls)
seq_printf(seq, ",nls=%s", sbi->nls->charset);
- if (
sbi->flags & HFSPLUS_SB_NODECOMPOSE
)
+ if (
test_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags)
)
seq_printf(seq, ",nodecompose");
return 0;
}
seq_printf(seq, ",nodecompose");
return 0;
}