usb: quirks: add control message delay for 1b1c:1b20

[pandora-kernel.git] / fs / udf / namei.c

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 4639e13..483d662 100644 (file)
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -235,7 +235,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
                if (!lfi)
                        continue;
 
-               flen = udf_get_filename(dir->i_sb, nameptr, fname, lfi);
+               flen = udf_get_filename(dir->i_sb, nameptr, lfi, fname,
+                                       UDF_NAME_LEN);
                if (flen && udf_match(flen, fname, child->len, child->name))
                        goto out_ok;
        }
@@ -1293,6 +1294,7 @@ static int udf_encode_fh(struct dentry *de, __u32 *fh, int *lenp,
        *lenp = 3;
        fid->udf.block = location.logicalBlockNum;
        fid->udf.partref = location.partitionReferenceNum;
+       fid->udf.parent_partref = 0;
        fid->udf.generation = inode->i_generation;
 
        if (connectable && !S_ISDIR(inode->i_mode)) {