diff options
| author | Jan Kara <jack@suse.cz> | 2017-11-14 11:09:53 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-11-14 11:09:53 +0100 |
| commit | 838bee9e756ec46e9b5be25f9e44388d7e185a2a (patch) | |
| tree | ebabacacc94478173d2707ea3f931a79b7bae214 /fs/udf/dir.c | |
| parent | quota: Generate warnings for DQUOT_SPACE_NOFAIL allocations (diff) | |
| parent | quota: be aware of error from dquot_initialize (diff) | |
| download | linux-838bee9e756ec46e9b5be25f9e44388d7e185a2a.tar.xz linux-838bee9e756ec46e9b5be25f9e44388d7e185a2a.zip | |
Merge udf, isofs, quota, ext2 changes for 4.15-rc1.
Diffstat (limited to 'fs/udf/dir.c')
| -rw-r--r-- | fs/udf/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c index 2d0e028067eb..c19dba45aa20 100644 --- a/fs/udf/dir.c +++ b/fs/udf/dir.c @@ -43,7 +43,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx) struct udf_fileident_bh fibh = { .sbh = NULL, .ebh = NULL}; struct fileIdentDesc *fi = NULL; struct fileIdentDesc cfi; - int block, iblock; + udf_pblk_t block, iblock; loff_t nf_pos; int flen; unsigned char *fname = NULL, *copy_name = NULL; |