projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
9p
/
acl.c
diff --git
a/fs/9p/acl.c
b/fs/9p/acl.c
index 8482f2d1160667ba1255ee5b48434287bc51da65..31c010372660154f6665782e89cea669b8457d29 100644
(file)
--- a/
fs/9p/acl.c
+++ b/
fs/9p/acl.c
@@
-247,7
+247,7
@@
static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name,
if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)
return v9fs_remote_get_acl(dentry, name, buffer, size, type);
if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)
return v9fs_remote_get_acl(dentry, name, buffer, size, type);
- acl = v9fs_get_cached_acl(d
entry->d_inode
, type);
+ acl = v9fs_get_cached_acl(d
_inode(dentry)
, type);
if (IS_ERR(acl))
return PTR_ERR(acl);
if (acl == NULL)
if (IS_ERR(acl))
return PTR_ERR(acl);
if (acl == NULL)
@@
-285,7
+285,7
@@
static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
int retval;
struct posix_acl *acl;
struct v9fs_session_info *v9ses;
int retval;
struct posix_acl *acl;
struct v9fs_session_info *v9ses;
- struct inode *inode = d
entry->d_inode
;
+ struct inode *inode = d
_inode(dentry)
;
if (strcmp(name, "") != 0)
return -EINVAL;
if (strcmp(name, "") != 0)
return -EINVAL;