diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | exfat_fix.patch | 48 |
3 files changed, 1 insertions, 53 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Mar 28 00:16:30 UTC 2016 +# Sat Apr 2 00:26:39 UTC 2016 pkgbase = linux-zen-git pkgdesc = Featureful kernel including various new features, code and optimizations to better suit desktops pkgver = 4.5.0+575611+g3831a7a @@ -14,11 +14,9 @@ pkgbase = linux-zen-git options = !strip source = linux-zen.conf source = linux-zen.preset - source = exfat_fix.patch source = git://github.com/damentz/zen-kernel.git#branch=4.5/master sha256sums = 6373073ad943e068478ef1373be4eb2a7e473da8743d946f1f50cd364685ab87 sha256sums = 18fe6b2664a9a740544c4cb990efe5ec933d6e64caf9e5d0a6ced92af0027c2d - sha256sums = 732b0f9041acacccbe96c0f7dff6faf34930abdbd29f97c21fd5e5822aca78fe sha256sums = SKIP pkgname = linux-zen-git @@ -16,11 +16,9 @@ pkgrel=1 options=("!strip") source=("linux-zen.conf" "linux-zen.preset" - "exfat_fix.patch" 'git://github.com/damentz/zen-kernel.git#branch=4.5/master') sha256sums=('6373073ad943e068478ef1373be4eb2a7e473da8743d946f1f50cd364685ab87' '18fe6b2664a9a740544c4cb990efe5ec933d6e64caf9e5d0a6ced92af0027c2d' - '732b0f9041acacccbe96c0f7dff6faf34930abdbd29f97c21fd5e5822aca78fe' 'SKIP') _CORES=1 diff --git a/exfat_fix.patch b/exfat_fix.patch deleted file mode 100644 index 6bad9073bdc0..000000000000 --- a/exfat_fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/fs/exfat/exfat_super.c b/fs/exfat/exfat_super.c -index a003a72..02d4fd2 100644 ---- a/fs/exfat/exfat_super.c -+++ b/fs/exfat/exfat_super.c -@@ -1359,7 +1359,19 @@ const struct inode_operations exfat_dir_inode_operations = { - /*======================================================================*/ - /* File Operations */ - /*======================================================================*/ --#if LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) -+static const char *exfat_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *done) -+{ -+ struct exfat_inode_info *ei = EXFAT_I(inode); -+ if (ei->target != NULL) { -+ char *cookie = ei->target; -+ if (cookie != NULL) { -+ return (char *)(ei->target); -+ } -+ } -+ return NULL; -+} -+#elif LINUX_VERSION_CODE > KERNEL_VERSION(4,1,0) - static const char *exfat_follow_link(struct dentry *dentry, void **cookie) - { - struct exfat_inode_info *ei = EXFAT_I(dentry->d_inode); -@@ -1376,7 +1388,12 @@ static void *exfat_follow_link(struct dentry *dentry, struct nameidata *nd) - - const struct inode_operations exfat_symlink_inode_operations = { - .readlink = generic_readlink, -- .follow_link = exfat_follow_link, -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0) -+ .follow_link = exfat_follow_link, -+ #endif -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) -+ .get_link = exfat_get_link, -+ #endif - }; - - static int exfat_file_release(struct inode *inode, struct file *filp) -@@ -1970,7 +1987,7 @@ static void exfat_evict_inode(struct inode *inode) - if (!inode->i_nlink) - i_size_write(inode, 0); - invalidate_inode_buffers(inode); --#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,80) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) - end_writeback(inode); - #else - clear_inode(inode); |