Changeset 767 for branches


Ignore:
Timestamp:
Oct 16, 2016, 1:27:19 AM (3 years ago)
Author:
ehem
Message:

Update OpenWRT patch for 3.16, patch 100-overlayfs.patch had been broken
by one of the mainline kernel or Debian kernel updates. Now working
again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-build/linux-patch-openwrt/patches-3.16/100-overlayfs.patch

    r668 r767  
    11--- a/Documentation/filesystems/Locking
    22+++ b/Documentation/filesystems/Locking
    3 @@ -65,6 +65,7 @@ prototypes:
     3@@ -67,6 +67,7 @@ prototypes:
    44                                struct file *, unsigned open_flag,
    55                                umode_t create_mode, int *opened);
     
    99 locking rules:
    1010        all may block
    11 @@ -93,6 +94,7 @@ fiemap:               no
     11@@ -96,6 +97,7 @@ fiemap:               no
    1212 update_time:   no
    1313 atomic_open:   yes
     
    221221--- a/Documentation/filesystems/vfs.txt
    222222+++ b/Documentation/filesystems/vfs.txt
    223 @@ -362,6 +362,7 @@ struct inode_operations {
     223@@ -364,6 +364,7 @@ struct inode_operations {
    224224        int (*atomic_open)(struct inode *, struct dentry *, struct file *,
    225225                        unsigned open_flag, umode_t create_mode, int *opened);
     
    229229 
    230230 Again, all methods are called without any locks being held, unless
    231 @@ -681,6 +682,12 @@ struct address_space_operations {
     231@@ -696,6 +697,12 @@ struct address_space_operations {
    232232        but instead uses bmap to find out where the blocks in the file
    233233        are and uses those addresses directly.
     
    244244--- a/MAINTAINERS
    245245+++ b/MAINTAINERS
    246 @@ -6452,6 +6452,13 @@ F:       drivers/scsi/osd/
     246@@ -6668,6 +6668,13 @@ F:       drivers/scsi/osd/
    247247 F:     include/scsi/osd_*
    248248 F:     fs/exofs/
     
    319319--- a/fs/namei.c
    320320+++ b/fs/namei.c
    321 @@ -415,6 +415,7 @@ int __inode_permission(struct inode *ino
     321@@ -416,6 +416,7 @@ int __inode_permission(struct inode *ino
    322322 
    323323        return security_inode_permission(inode, mask);
     
    327327 /**
    328328  * sb_permission - Check superblock-level permissions
    329 @@ -3037,9 +3038,12 @@ finish_open_created:
     329@@ -3075,9 +3076,12 @@ finish_open_created:
    330330        error = may_open(&nd->path, acc_mode, open_flag);
    331331        if (error)
     
    345345--- a/fs/namespace.c
    346346+++ b/fs/namespace.c
    347 @@ -1586,6 +1586,33 @@ void drop_collected_mounts(struct vfsmou
     347@@ -1600,6 +1600,33 @@ void drop_collected_mounts(struct vfsmou
    348348        namespace_unlock();
    349349 }
     
    381381--- a/fs/open.c
    382382+++ b/fs/open.c
    383 @@ -822,8 +822,7 @@ struct file *dentry_open(const struct pa
     383@@ -825,8 +825,7 @@ struct file *dentry_open(const struct pa
    384384        f = get_empty_filp();
    385385        if (!IS_ERR(f)) {
     
    391391                        /* from now on we need fput() to dispose of f */
    392392                        error = open_check_o_direct(f);
    393 @@ -840,6 +839,26 @@ struct file *dentry_open(const struct pa
     393@@ -843,6 +842,26 @@ struct file *dentry_open(const struct pa
    394394 }
    395395 EXPORT_SYMBOL(dentry_open);
     
    31493149--- a/fs/splice.c
    31503150+++ b/fs/splice.c
    3151 @@ -1327,6 +1327,7 @@ long do_splice_direct(struct file *in, l
     3151@@ -1353,6 +1353,7 @@ long do_splice_direct(struct file *in, l
    31523152 
    31533153        return ret;
     
    31593159--- a/include/linux/fs.h
    31603160+++ b/include/linux/fs.h
    3161 @@ -249,6 +249,12 @@ struct iattr {
     3161@@ -256,6 +256,12 @@ struct iattr {
    31623162  */
    31633163 #include <linux/quota.h>
     
    31723172  * enum positive_aop_returns - aop return codes with specific semantics
    31733173  *
    3174 @@ -1329,6 +1335,11 @@ struct super_block {
     3174@@ -1284,6 +1290,11 @@ struct super_block {
    31753175        struct list_lru         s_dentry_lru ____cacheline_aligned_in_smp;
    31763176        struct list_lru         s_inode_lru ____cacheline_aligned_in_smp;
     
    31843184 
    31853185 extern struct timespec current_fs_time(struct super_block *sb);
    3186 @@ -1585,6 +1596,7 @@ struct inode_operations {
     3186@@ -1550,6 +1561,7 @@ struct inode_operations {
    31873187                           umode_t create_mode, int *opened);
    31883188        int (*tmpfile) (struct inode *, struct dentry *, umode_t);
     
    31923192 
    31933193 ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
    3194 @@ -2079,6 +2091,7 @@ extern struct file *file_open_name(struc
    3195  extern struct file *filp_open(const char *, int, umode_t);
    3196  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
    3197                                    const char *, int);
     3194@@ -2064,6 +2076,7 @@ extern struct file *file_open_name(struc
     3195 extern struct file *file_open_root_umode(struct dentry *, struct vfsmount *,
     3196                                         const char *, int, umode_t);
     3197 #define file_open_root file_open_root_umode
    31983198+extern int vfs_open(const struct path *, struct file *, const struct cred *);
    31993199 extern struct file * dentry_open(const struct path *, int, const struct cred *);
    32003200 extern int filp_close(struct file *, fl_owner_t id);
    32013201 
    3202 @@ -2292,6 +2305,7 @@ extern sector_t bmap(struct inode *, sec
     3202@@ -2277,6 +2290,7 @@ extern sector_t bmap(struct inode *, sec
    32033203 #endif
    32043204 extern int notify_change(struct dentry *, struct iattr *, struct inode **);
     
    32083208 
    32093209 static inline bool execute_ok(struct inode *inode)
    3210 @@ -2500,6 +2514,9 @@ extern ssize_t generic_file_splice_write
     3210@@ -2475,6 +2489,9 @@ extern ssize_t generic_file_splice_write
    32113211                struct file *, loff_t *, size_t, unsigned int);
    32123212 extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
Note: See TracChangeset for help on using the changeset viewer.