wok diff linux/stuff/linux-romfs.u @ rev 22392
ffserver removed in ffmpeg >= 4.0
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Dec 01 11:07:17 2019 +0100 (2019-12-01) |
parents | b9fafbaeb4c6 |
children |
line diff
1.1 --- a/linux/stuff/linux-romfs.u Thu Oct 23 18:05:56 2014 +0200 1.2 +++ b/linux/stuff/linux-romfs.u Sun Dec 01 11:07:17 2019 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 ---- linux-3.2.53/fs/romfs/super.c 1.5 -+++ linux-3.2.53/fs/romfs/super.c 1.6 +--- linux-3.16.53/fs/romfs/super.c 1.7 ++++ linux-3.16.53/fs/romfs/super.c 1.8 @@ -74,6 +74,8 @@ 1.9 #include <linux/uaccess.h> 1.10 #include "internal.h" 1.11 @@ -9,7 +9,7 @@ 1.12 static struct kmem_cache *romfs_inode_cachep; 1.13 1.14 static const umode_t romfs_modemap[8] = { 1.15 -@@ -302,6 +304,7 @@ 1.16 +@@ -299,6 +301,7 @@ 1.17 unsigned nextfh; 1.18 int ret; 1.19 umode_t mode; 1.20 @@ -17,7 +17,7 @@ 1.21 1.22 /* we might have to traverse a chain of "hard link" file entries to get 1.23 * to the actual file */ 1.24 -@@ -312,11 +315,12 @@ 1.25 +@@ -309,11 +312,12 @@ 1.26 1.27 /* XXX: do romfs_checksum here too (with name) */ 1.28 1.29 @@ -31,7 +31,7 @@ 1.30 } 1.31 1.32 /* determine the length of the filename */ 1.33 -@@ -352,6 +356,12 @@ 1.34 +@@ -349,6 +353,12 @@ 1.35 i->i_fop = &romfs_dir_operations; 1.36 if (nextfh & ROMFH_EXEC) 1.37 mode |= S_IXUGO; 1.38 @@ -44,7 +44,7 @@ 1.39 break; 1.40 case ROMFH_REG: 1.41 i->i_fop = &romfs_ro_fops; 1.42 -@@ -367,16 +377,40 @@ 1.43 +@@ -364,16 +374,40 @@ 1.44 i->i_data.a_ops = &romfs_aops; 1.45 mode |= S_IRWXUGO; 1.46 break; 1.47 @@ -69,10 +69,10 @@ 1.48 + 1.49 + int signed_spec = spec; 1.50 + 1.51 -+ i->i_uid = signed_spec >> 20; 1.52 -+ i->i_gid = (spec >> 12) & 0xFF; 1.53 ++ i->i_uid.val = signed_spec >> 20; 1.54 ++ i->i_gid.val = (spec >> 12) & 0xFF; 1.55 + if (spec & 0100) 1.56 -+ i->i_gid |= ~0xFF; /* sign extention */ 1.57 ++ i->i_gid.val |= ~0xFF; /* sign extention */ 1.58 + i->i_mode &= ~07677; 1.59 + i->i_mode |= spec & 07677; 1.60 + 1.61 @@ -88,7 +88,7 @@ 1.62 unlock_new_inode(i); 1.63 return i; 1.64 1.65 -@@ -428,6 +462,7 @@ 1.66 +@@ -424,6 +458,7 @@ 1.67 (romfs_maxsize(dentry->d_sb) + ROMBSIZE - 1) >> ROMBSBITS; 1.68 buf->f_fsid.val[0] = (u32)id; 1.69 buf->f_fsid.val[1] = (u32)(id >> 32);