aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/vfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r--fs/nfsd/vfs.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index ae3940dc85cc..de340ffd33c3 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -50,7 +50,6 @@
50#include <linux/posix_acl.h> 50#include <linux/posix_acl.h>
51#ifdef CONFIG_NFSD_V4 51#ifdef CONFIG_NFSD_V4
52#include <linux/posix_acl_xattr.h> 52#include <linux/posix_acl_xattr.h>
53#include <linux/xattr_acl.h>
54#include <linux/xattr.h> 53#include <linux/xattr.h>
55#include <linux/nfs4.h> 54#include <linux/nfs4.h>
56#include <linux/nfs4_acl.h> 55#include <linux/nfs4_acl.h>
@@ -425,13 +424,13 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
425 goto out_nfserr; 424 goto out_nfserr;
426 425
427 if (pacl) { 426 if (pacl) {
428 error = set_nfsv4_acl_one(dentry, pacl, XATTR_NAME_ACL_ACCESS); 427 error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
429 if (error < 0) 428 if (error < 0)
430 goto out_nfserr; 429 goto out_nfserr;
431 } 430 }
432 431
433 if (dpacl) { 432 if (dpacl) {
434 error = set_nfsv4_acl_one(dentry, dpacl, XATTR_NAME_ACL_DEFAULT); 433 error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT);
435 if (error < 0) 434 if (error < 0)
436 goto out_nfserr; 435 goto out_nfserr;
437 } 436 }
@@ -498,7 +497,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_ac
498 struct posix_acl *pacl = NULL, *dpacl = NULL; 497 struct posix_acl *pacl = NULL, *dpacl = NULL;
499 unsigned int flags = 0; 498 unsigned int flags = 0;
500 499
501 pacl = _get_posix_acl(dentry, XATTR_NAME_ACL_ACCESS); 500 pacl = _get_posix_acl(dentry, POSIX_ACL_XATTR_ACCESS);
502 if (IS_ERR(pacl) && PTR_ERR(pacl) == -ENODATA) 501 if (IS_ERR(pacl) && PTR_ERR(pacl) == -ENODATA)
503 pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); 502 pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
504 if (IS_ERR(pacl)) { 503 if (IS_ERR(pacl)) {
@@ -508,7 +507,7 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_ac
508 } 507 }
509 508
510 if (S_ISDIR(inode->i_mode)) { 509 if (S_ISDIR(inode->i_mode)) {
511 dpacl = _get_posix_acl(dentry, XATTR_NAME_ACL_DEFAULT); 510 dpacl = _get_posix_acl(dentry, POSIX_ACL_XATTR_DEFAULT);
512 if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA) 511 if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA)
513 dpacl = NULL; 512 dpacl = NULL;
514 else if (IS_ERR(dpacl)) { 513 else if (IS_ERR(dpacl)) {