diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-10-07 19:14:03 +0900 |
| commit | 3cc83f9d08a80fddf4c1e8e766eff8273f30814c (patch) | |
| tree | 831246a1b77d26d0296a84c90684e0fee0368737 /fs | |
| parent | 64f41212d880f3d00c6994d973aadeec5bda1b65 (diff) | |
| parent | 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 (diff) | |
| download | u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.zip u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.gz u-boot-imx-3cc83f9d08a80fddf4c1e8e766eff8273f30814c.tar.bz2 | |
Merge branch 'uboot'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Kconfig | 19 | ||||
| -rw-r--r-- | fs/cramfs/Kconfig | 0 | ||||
| -rw-r--r-- | fs/ext4/Kconfig | 0 | ||||
| -rw-r--r-- | fs/fat/Kconfig | 0 | ||||
| -rw-r--r-- | fs/jffs2/Kconfig | 0 | ||||
| -rw-r--r-- | fs/reiserfs/Kconfig | 0 | ||||
| -rw-r--r-- | fs/ubifs/Kconfig | 0 | ||||
| -rw-r--r-- | fs/zfs/zfs.c | 6 |
8 files changed, 22 insertions, 3 deletions
diff --git a/fs/Kconfig b/fs/Kconfig new file mode 100644 index 0000000..41bb0b9 --- /dev/null +++ b/fs/Kconfig @@ -0,0 +1,19 @@ +# +# File system configuration +# + +menu "File systems" + +source "fs/ext4/Kconfig" + +source "fs/reiserfs/Kconfig" + +source "fs/fat/Kconfig" + +source "fs/jffs2/Kconfig" + +source "fs/ubifs/Kconfig" + +source "fs/cramfs/Kconfig" + +endmenu diff --git a/fs/cramfs/Kconfig b/fs/cramfs/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/cramfs/Kconfig diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/ext4/Kconfig diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/fat/Kconfig diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/jffs2/Kconfig diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/reiserfs/Kconfig diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fs/ubifs/Kconfig diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 099d517..818d3d9 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -772,7 +772,7 @@ zap_leaf_array_equal(zap_leaf_phys_t *l, zfs_endian_t endian, while (bseen < array_len) { struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array; - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft)) return 0; @@ -794,7 +794,7 @@ zap_leaf_array_get(zap_leaf_phys_t *l, zfs_endian_t endian, int blksft, while (bseen < array_len) { struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array; - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft)) /* Don't use errno because this error is to be ignored. */ @@ -2118,7 +2118,7 @@ zfs_read(zfs_file_t file, char *buf, uint64_t len) data->file_start = blkid * blksz; data->file_end = data->file_start + blksz; - movesize = MIN(length, data->file_end - (int) file->offset - red); + movesize = min(length, data->file_end - (int)file->offset - red); memmove(buf, data->file_buf + file->offset + red - data->file_start, movesize); |