Eliminate UDF duplication

PATCH In review Vladimir 'φ-coder/phcoder' Serbinenko 1 participant 1 message Jun 1, 2012

Subsystems (2)

VFS UDF filesystem

lore

Share & tools

lore

Vladimir 'φ-coder/phcoder' Serbinenko

author

2012-06-01 01:10 UTC #0 lore raw

PATCH 3/4 Eliminate UDF duplication

I don't insist on this one as I find dedicated UTF-8-UTF-16 neater, simple, easier to understand and faster. However it seems that for maintenance and compatibility reasons it's preferable for it to go. If you want to keep it I'll adjust my next patch.

Signed-off-by Vladimir Serbinenko <[email protected]>

---
 fs/udf/Kconfig   |    5 --
 fs/udf/super.c   |   47 +++++--------
 fs/udf/udf_sb.h  |    2 -
 fs/udf/udfdecl.h |    3 +-
 fs/udf/unicode.c |  206 +++---------------------------------------------------
 5 files changed, 28 insertions(+), 235 deletions(-)

fs/udf/Kconfig +0 -5

index 0e0e99b..bbc8e60 100644
@@ -11,8 +11,3 @@ config UDF_FS
 	  module will be called udf.
 
 	  If unsure, say N.
-
-config UDF_NLS
-	bool
-	default y
-	depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)

fs/udf/super.c +16 ~~-31~~

97 lines not on this page · raw message

fs/udf/udf_sb.h +0 -2

index 42ad69a..6a4de63 100644
@@ -21,8 +21,6 @@
 #define UDF_FLAG_UNDELETE		6
 #define UDF_FLAG_UNHIDE			7
 #define UDF_FLAG_VARCONV		8
-#define UDF_FLAG_NLS_MAP		9
-#define UDF_FLAG_UTF8			10
 #define UDF_FLAG_UID_FORGET     11    /* save -1 for uid to disk */
 #define UDF_FLAG_UID_IGNORE     12    /* use sb uid instead of on disk uid */
 #define UDF_FLAG_GID_FORGET     13

fs/udf/udfdecl.h +2 -1

index ebe1031..a4349e4 100644
@@ -211,7 +211,8 @@ extern int udf_get_filename(struct super_block *, uint8_t *, uint8_t *, int);
 extern int udf_put_filename(struct super_block *, const uint8_t *, uint8_t *,
 			    int);
 extern int udf_build_ustr(struct ustr *, dstring *, int);
-extern int udf_CS0toUTF8(struct ustr *, const struct ustr *);
+int udf_CS0toNLS(struct nls_table *nls, struct ustr *utf_o,
+		 const struct ustr *ocu_i);
 
 /* ialloc.c */
 extern void udf_free_inode(struct inode *);

fs/udf/unicode.c +10 ~~-196~~

225 lines not on this page · raw message

Signature · 5 lines

1.7.10

-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko