diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
| commit | 4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2 (patch) | |
| tree | 942b24dcd275407d76f6b3ef85f6db9af1160163 /fs | |
| parent | 854df603da65bc56fe72218b402903f26155b0f0 (diff) | |
| parent | 79fdb84a6b46f7c129225b57007b63e765747d52 (diff) | |
| download | barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.gz barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cramfs/cramfs.c | 2 | ||||
| -rw-r--r-- | fs/efi.c | 3 | ||||
| -rw-r--r-- | fs/ubifs/super.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 988fa7e8e6..a02c253841 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -306,7 +306,7 @@ static int cramfs_close(struct device_d *dev, FILE *file) free(inodei->block_ptrs); free(inodei); - + return 0; } @@ -33,6 +33,7 @@ #include <libfile.h> #include <mach/efi.h> #include <mach/efi-device.h> +#include <linux/stddef.h> /* Open modes */ #define EFI_FILE_MODE_READ 0x0000000000000001 @@ -93,8 +94,6 @@ struct efi_file_info { s16 FileName[1]; }; -typedef unsigned short wchar_t; - struct efifs_priv { struct efi_file_handle *root_dir; struct efi_file_io_interface *protocol; diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 0017a4a2d1..ce6e95e373 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2413,7 +2413,7 @@ retry: goto retry; #endif } - + err = set(s, data); if (err) { #ifndef __BAREBOX__ diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index d2dcf7e180..5c5a82637e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -424,7 +424,7 @@ struct super_block { struct file_system_type { const char *name; int fs_flags; -#define FS_REQUIRES_DEV 1 +#define FS_REQUIRES_DEV 1 #define FS_BINARY_MOUNTDATA 2 #define FS_HAS_SUBTYPE 4 #define FS_USERNS_MOUNT 8 /* Can be mounted by userns root */ |