diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
| commit | 034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b (patch) | |
| tree | a8912608d1b8f1614e58c94f67e0b9f1801018e6 /fs | |
| parent | 7991fe1b8eb057c6d7acc5c91f10108c1ee10a52 (diff) | |
| parent | 092479d7da288479eb99362b4e852948b1de6de9 (diff) | |
| download | barebox-034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b.tar.gz barebox-034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/ext4_common.c | 3 | ||||
| -rw-r--r-- | fs/fat/fat.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 590f54d5d8..1ecbb8dfb7 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -127,7 +127,8 @@ int ext4fs_read_inode(struct ext2_data *data, int ino, struct ext2_inode *inode) return 0; } -int ext4fs_get_indir_block(struct ext2fs_node *node, struct ext4fs_indir_block *indir, int blkno) +static int ext4fs_get_indir_block(struct ext2fs_node *node, + struct ext4fs_indir_block *indir, int blkno) { struct ext_filesystem *fs = node->data->fs; int blksz; diff --git a/fs/fat/fat.c b/fs/fat/fat.c index ece937d443..49cd78ff92 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1,7 +1,7 @@ /* - * ramfs.c - a malloc based filesystem + * fat.c - FAT filesystem barebox driver * - * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix + * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * * See file CREDITS for list of people who contributed to this * project. |