kernel: refresh patches for kernel 3.0-rc5

[openwrt.git] / tools / mtd-utils / patches / 110-portability.patch

diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch
index 4ef27d1..3b71231 100644 (file)
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -10,14 +10,14 @@
  #include "compr.h"
 --- a/compr_zlib.c
 +++ b/compr_zlib.c
-@@ -35,7 +35,6 @@
- #include <stdint.h>
+@@ -39,7 +39,6 @@
  #include <zlib.h>
+ #undef crc32
  #include <stdio.h>
 -#include <asm/types.h>
  #include <linux/jffs2.h>
+ #include "common.h"
  #include "compr.h"
- 
 --- a/rbtree.h
 +++ b/rbtree.h
 @@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa
@@ -30,16 +30,6 @@
  
  struct rb_node
  {
-@@ -131,7 +130,9 @@ static inline void rb_set_color(struct r
- 
- #define RB_ROOT       (struct rb_root) { NULL, }
- 
-+#ifndef offsetof
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+#endif
- 
- #define container_of(ptr, type, member) ({                      \
-         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
 --- a/include/mtd/ubi-media.h
 +++ b/include/mtd/ubi-media.h
 @@ -30,7 +30,15 @@
@@ -58,3 +48,103 @@
  
  /* The version of UBI images supported by this implementation */
  #define UBI_VERSION 1
+--- a/mkfs.ubifs/mkfs.ubifs.h
++++ b/mkfs.ubifs/mkfs.ubifs.h
+@@ -34,7 +34,14 @@
+ #include <endian.h>
+ #include <byteswap.h>
+ #include <linux/types.h>
++#ifdef __linux__
+ #include <linux/fs.h>
++#else
++# ifndef O_LARGEFILE
++#  define O_LARGEFILE 0
++# endif
++# define llseek lseek
++#endif
+ 
+ #include <getopt.h>
+ #include <sys/types.h>
+--- a/mkfs.ubifs/mkfs.ubifs.c
++++ b/mkfs.ubifs/mkfs.ubifs.c
+@@ -805,8 +805,8 @@ int write_leb(int lnum, int len, void *b
+               if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
+                       return sys_err_msg("ubi_leb_change_start failed");
+ 
+-      if (lseek64(out_fd, pos, SEEK_SET) != pos)
+-              return sys_err_msg("lseek64 failed seeking %lld",
++      if (llseek(out_fd, pos, SEEK_SET) != pos)
++              return sys_err_msg("llseek failed seeking %lld",
+                                  (long long)pos);
+ 
+       if (write(out_fd, buf, c->leb_size) != c->leb_size)
+@@ -1063,6 +1063,7 @@ static int add_inode_with_data(struct st
+ 
+       if (c->default_compr != UBIFS_COMPR_NONE)
+               use_flags |= UBIFS_COMPR_FL;
++#ifndef NO_NATIVE_SUPPORT
+       if (flags & FS_COMPR_FL)
+               use_flags |= UBIFS_COMPR_FL;
+       if (flags & FS_SYNC_FL)
+@@ -1073,6 +1074,7 @@ static int add_inode_with_data(struct st
+               use_flags |= UBIFS_APPEND_FL;
+       if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
+               use_flags |= UBIFS_DIRSYNC_FL;
++#endif
+ 
+       memset(ino, 0, UBIFS_INO_NODE_SZ);
+ 
+@@ -1142,7 +1144,9 @@ static int add_dir_inode(DIR *dir, ino_t
+               fd = dirfd(dir);
+               if (fd == -1)
+                       return sys_err_msg("dirfd failed");
++#ifndef NO_NATIVE_SUPPORT
+               if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
++#endif
+                       flags = 0;
+       }
+ 
+@@ -1327,10 +1331,12 @@ static int add_file(const char *path_nam
+               key_write(&key, &dn->key);
+               dn->size = cpu_to_le32(bytes_read);
+               out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
++#ifndef NO_NATIVE_SUPPORT
+               if (c->default_compr == UBIFS_COMPR_NONE &&
+                   (flags & FS_COMPR_FL))
+                       use_compr = UBIFS_COMPR_LZO;
+               else
++#endif
+                       use_compr = c->default_compr;
+               compr_type = compress_data(buf, bytes_read, &dn->data,
+                                          &out_len, use_compr);
+@@ -1372,7 +1378,9 @@ static int add_non_dir(const char *path_
+               if (fd == -1)
+                       return sys_err_msg("failed to open file '%s'",
+                                          path_name);
++#ifndef NO_NATIVE_SUPPORT
+               if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
++#endif
+                       flags = 0;
+               if (close(fd) == -1)
+                       return sys_err_msg("failed to close file '%s'",
+--- a/mkfs.ubifs/devtable.c
++++ b/mkfs.ubifs/devtable.c
+@@ -134,6 +134,7 @@ static int interpret_table_entry(const c
+       unsigned int mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
+       unsigned int start = 0, increment = 0, count = 0;
+ 
++      buf[1023] = 0;
+       if (sscanf(line, "%1023s %c %o %u %u %u %u %u %u %u",
+                  buf, &type, &mode, &uid, &gid, &major, &minor,
+                  &start, &increment, &count) < 0)
+@@ -144,8 +145,8 @@ static int interpret_table_entry(const c
+               buf, type, mode, uid, gid, major, minor, start,
+               increment, count);
+ 
+-      len = strnlen(buf, 1024);
+-      if (len == 1024)
++      len = strlen(buf);
++      if (len == 1023)
+               return err_msg("too long path");
+ 
+       if (!strcmp(buf, "/"))