Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 5 insertions, 1 deletions

diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index cca0818aa4c..935dafba007 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;
                 }