diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-30 05:56:07 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-30 05:56:07 +0100 |
| commit | 606c0dafbe88102d64c1253caed8a2c36987070f (patch) | |
| tree | 23ce7b30341e71c6da8e0183d27e29167e833e26 /fs/hfsplus/options.c | |
| parent | [CIFS] Fix umount --force to wake up the pending response queue, not just (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff) | |
| download | linux-606c0dafbe88102d64c1253caed8a2c36987070f.tar.xz linux-606c0dafbe88102d64c1253caed8a2c36987070f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/hfsplus/options.c')
| -rw-r--r-- | fs/hfsplus/options.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c index cca0818aa4ca..935dafba0078 100644 --- a/fs/hfsplus/options.c +++ b/fs/hfsplus/options.c @@ -22,7 +22,7 @@ enum { opt_umask, opt_uid, opt_gid, opt_part, opt_session, opt_nls, opt_nodecompose, opt_decompose, - opt_err + opt_force, opt_err }; static match_table_t tokens = { @@ -36,6 +36,7 @@ static match_table_t tokens = { { opt_nls, "nls=%s" }, { opt_decompose, "decompose" }, { opt_nodecompose, "nodecompose" }, + { opt_force, "force" }, { opt_err, NULL } }; @@ -145,6 +146,9 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) case opt_nodecompose: sbi->flags |= HFSPLUS_SB_NODECOMPOSE; break; + case opt_force: + sbi->flags |= HFSPLUS_SB_FORCE; + break; default: return 0; } |