summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--kernel-5.12-backport.patch112
-rw-r--r--kernel-5.14-backport.patch2
4 files changed, 30 insertions, 96 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea06bce70024..9fe9e20ab99e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ntfs3-dkms-git
pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
- pkgver = r93.g35afb70
+ pkgver = r98.g95dd8b2
pkgrel = 1
url = https://github.com/Paragon-Software-Group/linux-ntfs3
arch = any
@@ -19,8 +19,8 @@ pkgbase = ntfs3-dkms-git
source = ntfs3::svn+https://github.com/Paragon-Software-Group/linux-ntfs3/branches/devel/fs/ntfs3
sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
sha512sums = ac00adb4a6d7fc685c39af054474631c930455e9ad0838338e6b3622b72451e81397506866b83a4a51dd0e34ed7752963c0fed9e8b017da5122e0dca3d345fb6
- sha512sums = c8ea6e02be4d9f116c2ab6d9446477a5d3abb07d7b6fe89f6c9a08218925c653ac1cdfd5981fb5599730076f59765e0e4d69a1f7285e545fe3046239f802edcf
- sha512sums = c4a127bb2214242d0ae23a12c1b2eaa064feeb30d4dd21ed1cecf6d9787723da83491724142f1952e493303ea06669b75054ab476769c3b0db7fe7a1403d6acf
+ sha512sums = fc81e387bdd109177483d0e63d6e8d08034479be7712f506c1b7c053feb0ec796b030418b15d1bc408e5ca7292b9653dd15878dff627c4e98a739d44b900a6a0
+ sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
sha512sums = SKIP
pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 43c81787b9df..7457883d5288 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=ntfs3-dkms-git
-pkgver=r93.g35afb70
+pkgver=r98.g95dd8b2
pkgrel=1
pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
arch=('any')
@@ -22,8 +22,8 @@ source=(
sha512sums=(
'533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
'ac00adb4a6d7fc685c39af054474631c930455e9ad0838338e6b3622b72451e81397506866b83a4a51dd0e34ed7752963c0fed9e8b017da5122e0dca3d345fb6'
- 'c8ea6e02be4d9f116c2ab6d9446477a5d3abb07d7b6fe89f6c9a08218925c653ac1cdfd5981fb5599730076f59765e0e4d69a1f7285e545fe3046239f802edcf'
- 'c4a127bb2214242d0ae23a12c1b2eaa064feeb30d4dd21ed1cecf6d9787723da83491724142f1952e493303ea06669b75054ab476769c3b0db7fe7a1403d6acf'
+ 'fc81e387bdd109177483d0e63d6e8d08034479be7712f506c1b7c053feb0ec796b030418b15d1bc408e5ca7292b9653dd15878dff627c4e98a739d44b900a6a0'
+ '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
'SKIP'
)
diff --git a/kernel-5.12-backport.patch b/kernel-5.12-backport.patch
index 13a78909b4b5..bef6b98ae989 100644
--- a/kernel-5.12-backport.patch
+++ b/kernel-5.12-backport.patch
@@ -18,7 +18,7 @@
stat->result_mask |= STATX_BTIME;
stat->btime = ni->i_crtime;
-@@ -725,7 +725,7 @@
+@@ -728,7 +728,7 @@
/*
* ntfs3_setattr - inode_operations::setattr
*/
@@ -27,7 +27,7 @@
struct iattr *attr)
{
struct super_block *sb = dentry->d_sb;
-@@ -744,7 +744,7 @@
+@@ -747,7 +747,7 @@
ia_valid = attr->ia_valid;
}
@@ -36,7 +36,7 @@
if (err)
goto out;
-@@ -769,10 +769,10 @@
+@@ -772,10 +772,10 @@
ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
}
@@ -239,16 +239,16 @@
--- a/xattr.c
+++ b/xattr.c
-@@ -481,7 +481,7 @@
- kfree(acl);
+@@ -476,7 +476,7 @@
}
+ #ifdef CONFIG_NTFS3_FS_POSIX_ACL
-static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,
+static struct posix_acl *ntfs_get_acl_ex(
struct inode *inode, int type,
int locked)
{
-@@ -517,7 +517,7 @@
+@@ -512,7 +512,7 @@
/* Translate extended attribute to acl. */
if (err >= 0) {
@@ -257,7 +257,7 @@
} else if (err == -ENODATA) {
acl = NULL;
} else {
-@@ -538,10 +538,10 @@
+@@ -533,10 +533,10 @@
struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
{
/* TODO: init_user_ns? */
@@ -268,9 +268,9 @@
-static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
+static noinline int ntfs_set_acl_ex(
struct inode *inode, struct posix_acl *acl,
- int type, int locked)
+ int type)
{
-@@ -559,7 +559,7 @@
+@@ -554,7 +554,7 @@
if (acl) {
umode_t mode = inode->i_mode;
@@ -279,7 +279,7 @@
&acl);
if (err)
goto out;
-@@ -594,7 +594,7 @@
+@@ -589,7 +589,7 @@
value = kmalloc(size, GFP_NOFS);
if (!value)
return -ENOMEM;
@@ -288,7 +288,7 @@
if (err < 0)
goto out;
flags = 0;
-@@ -615,13 +615,13 @@
+@@ -610,10 +610,10 @@
/*
* ntfs_set_acl - inode_operations::set_acl
*/
@@ -296,61 +296,12 @@
+int ntfs_set_acl(struct inode *inode,
struct posix_acl *acl, int type)
{
-- return ntfs_set_acl_ex(mnt_userns, inode, acl, type, 0);
-+ return ntfs_set_acl_ex(inode, acl, type, 0);
+- return ntfs_set_acl_ex(mnt_userns, inode, acl, type);
++ return ntfs_set_acl_ex(inode, acl, type);
}
--static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns,
-+static int ntfs_xattr_get_acl(
- struct inode *inode, int type, void *buffer,
- size_t size)
- {
-@@ -640,13 +640,13 @@
- if (!acl)
- return -ENODATA;
-
-- err = posix_acl_to_xattr(mnt_userns, acl, buffer, size);
-+ err = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
- ntfs_posix_acl_release(acl);
-
- return err;
- }
-
--static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns,
-+static int ntfs_xattr_set_acl(
- struct inode *inode, int type, const void *value,
- size_t size)
- {
-@@ -658,24 +658,24 @@
- return -EOPNOTSUPP;
- }
-
-- if (!inode_owner_or_capable(mnt_userns, inode))
-+ if (!inode_owner_or_capable(inode))
- return -EPERM;
-
- if (!value) {
- acl = NULL;
- } else {
-- acl = posix_acl_from_xattr(mnt_userns, value, size);
-+ acl = posix_acl_from_xattr(&init_user_ns, value, size);
- if (IS_ERR(acl))
- return PTR_ERR(acl);
-
- if (acl) {
-- err = posix_acl_valid(mnt_userns, acl);
-+ err = posix_acl_valid(&init_user_ns, acl);
- if (err)
- goto release_and_out;
- }
- }
-
-- err = ntfs_set_acl(mnt_userns, inode, acl, type);
-+ err = ntfs_set_acl(inode, acl, type);
-
- release_and_out:
- ntfs_posix_acl_release(acl);
-@@ -687,7 +687,7 @@
+ /*
+@@ -621,7 +621,7 @@
*
* Called from ntfs_create_inode().
*/
@@ -359,13 +310,13 @@
struct inode *dir)
{
struct posix_acl *default_acl, *acl;
-@@ -698,18 +698,18 @@
+@@ -632,18 +632,18 @@
return err;
if (default_acl) {
- err = ntfs_set_acl_ex(mnt_userns, inode, default_acl,
+ err = ntfs_set_acl_ex(inode, default_acl,
- ACL_TYPE_DEFAULT, 1);
+ ACL_TYPE_DEFAULT);
posix_acl_release(default_acl);
} else {
inode->i_default_acl = NULL;
@@ -377,10 +328,10 @@
if (!err)
- err = ntfs_set_acl_ex(mnt_userns, inode, acl,
+ err = ntfs_set_acl_ex(inode, acl,
- ACL_TYPE_ACCESS, 1);
+ ACL_TYPE_ACCESS);
posix_acl_release(acl);
}
-@@ -721,7 +721,7 @@
+@@ -655,7 +655,7 @@
/*
* ntfs_acl_chmod - Helper for ntfs3_setattr().
*/
@@ -389,7 +340,7 @@
{
struct super_block *sb = inode->i_sb;
-@@ -731,7 +731,7 @@
+@@ -665,7 +665,7 @@
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
@@ -398,7 +349,7 @@
}
/*
-@@ -737,7 +737,7 @@
+@@ -671,7 +671,7 @@
/*
* ntfs_permission - inode_operations::permission
*/
@@ -407,7 +358,7 @@
int mask)
{
if (ntfs_sb(inode->i_sb)->options->noacsrules) {
-@@ -745,7 +745,7 @@
+@@ -679,7 +679,7 @@
return 0;
}
@@ -416,16 +367,7 @@
}
/*
-@@ -857,7 +857,7 @@
- sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
- /* TODO: init_user_ns? */
- err = ntfs_xattr_get_acl(
-- &init_user_ns, inode,
-+ inode,
- name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1
- ? ACL_TYPE_ACCESS
- : ACL_TYPE_DEFAULT,
-@@ -876,7 +876,7 @@
+@@ -793,7 +793,7 @@
* ntfs_setxattr - inode_operations::setxattr
*/
static noinline int ntfs_setxattr(const struct xattr_handler *handler,
@@ -434,11 +376,3 @@
struct dentry *de, struct inode *inode,
const char *name, const void *value,
size_t size, int flags)
-@@ -986,6 +986,6 @@
- sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
- err = ntfs_xattr_set_acl(
-- mnt_userns, inode,
-+ inode,
- name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1
- ? ACL_TYPE_ACCESS
- : ACL_TYPE_DEFAULT,
diff --git a/kernel-5.14-backport.patch b/kernel-5.14-backport.patch
index f9b5dc636d0c..8cf9fa5669f2 100644
--- a/kernel-5.14-backport.patch
+++ b/kernel-5.14-backport.patch
@@ -1,6 +1,6 @@
--- a/file.c
+++ b/file.c
-@@ -1025,10 +1025,10 @@
+@@ -1028,10 +1028,10 @@
size_t cp, tail = PAGE_SIZE - off;
page = pages[ip];