[PATCH 4/5 linux-next] udf: rename udf_get_filename()

[Fabian Frederick]

udf_readdir(), udf_find_entry() and udf_pc_to_char() use
udf_get_filename to obtain name length. Give that function
an appropriate name.

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
 fs/udf/dir.c     | 3 ++-
 fs/udf/namei.c   | 3 ++-
 fs/udf/symlink.c | 7 ++++---
 fs/udf/udfdecl.h | 4 ++--
 fs/udf/unicode.c | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 05e90ed..edf4232 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -168,7 +168,8 @@ static int udf_readdir(struct file *file, struct dir_context *ctx)
 			continue;
 		}
 
-		flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);
+		flen = udf_get_filename_length(sb, nameptr, lfi, fname,
+					       UDF_NAME_LEN);
 		if (!flen)
 			continue;
 
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 33b246b..189b98b 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -234,7 +234,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
 		if (!lfi)
 			continue;
 
-		flen = udf_get_filename(sb, nameptr, lfi, fname, UDF_NAME_LEN);
+		flen = udf_get_filename_length(sb, nameptr, lfi, fname,
+					       UDF_NAME_LEN);
 		if (flen && udf_match(flen, fname, child->len, child->name))
 			goto out_ok;
 	}
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index ac10ca9..d986916a 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -80,9 +80,10 @@ static int udf_pc_to_char(struct super_block *sb, unsigned char *from,
 			elen += pc->lengthComponentIdent;
 			if (elen > fromlen)
 				return -EIO;
-			comp_len = udf_get_filename(sb, pc->componentIdent,
-						    pc->lengthComponentIdent,
-						    p, tolen);
+			comp_len = udf_get_filename_length(sb,
+						pc->componentIdent,
+						pc->lengthComponentIdent,
+						p, tolen);
 			p += comp_len;
 			tolen -= comp_len;
 			if (tolen == 0)
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index 47bb3f5..70dc260 100644
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -211,8 +211,8 @@ udf_get_lb_pblock(struct super_block *sb, struct kernel_lb_addr *loc,
 }
 
 /* unicode.c */
-extern int udf_get_filename(struct super_block *, uint8_t *, int, uint8_t *,
-			    int);
+extern int udf_get_filename_length(struct super_block *, uint8_t *, int,
+				   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);
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index b84fee3..209c0c7 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -334,8 +334,8 @@ try_again:
 	return u_len + 1;
 }
 
-int udf_get_filename(struct super_block *sb, uint8_t *sname, int slen,
-		     uint8_t *dname, int dlen)
+int udf_get_filename_length(struct super_block *sb, uint8_t *sname, int slen,
+			    uint8_t *dname, int dlen)
 {
 	struct ustr *filename, *unifilename;
 	int len = 0;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/