aboutsummaryrefslogtreecommitdiffstats
path: root/fs/overlayfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-04-11 00:48:00 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-04-11 00:48:00 -0400
commitce23e640133484eebc20ca7b7668388213e11327 (patch)
tree0b37de221fe6790396c3ae636bc56e5aacbcaf46 /fs/overlayfs
parentb296821a7c42fa58baa17513b2b7b30ae66f3336 (diff)
->getxattr(): pass dentry and inode as separate arguments
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r--fs/overlayfs/inode.c4
-rw-r--r--fs/overlayfs/overlayfs.h4
-rw-r--r--fs/overlayfs/super.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index a4ff5d0d7db9..c7b31a03dc9c 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -246,8 +246,8 @@ static bool ovl_need_xattr_filter(struct dentry *dentry,
246 return false; 246 return false;
247} 247}
248 248
249ssize_t ovl_getxattr(struct dentry *dentry, const char *name, 249ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
250 void *value, size_t size) 250 const char *name, void *value, size_t size)
251{ 251{
252 struct path realpath; 252 struct path realpath;
253 enum ovl_path_type type = ovl_path_real(dentry, &realpath); 253 enum ovl_path_type type = ovl_path_real(dentry, &realpath);
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 6a7090f4a441..99ec4b035237 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -173,8 +173,8 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr);
173int ovl_permission(struct inode *inode, int mask); 173int ovl_permission(struct inode *inode, int mask);
174int ovl_setxattr(struct dentry *dentry, const char *name, 174int ovl_setxattr(struct dentry *dentry, const char *name,
175 const void *value, size_t size, int flags); 175 const void *value, size_t size, int flags);
176ssize_t ovl_getxattr(struct dentry *dentry, const char *name, 176ssize_t ovl_getxattr(struct dentry *dentry, struct inode *inode,
177 void *value, size_t size); 177 const char *name, void *value, size_t size);
178ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size); 178ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
179int ovl_removexattr(struct dentry *dentry, const char *name); 179int ovl_removexattr(struct dentry *dentry, const char *name);
180struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags); 180struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index ef64984c9bbc..14cab381cece 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -274,7 +274,7 @@ static bool ovl_is_opaquedir(struct dentry *dentry)
274 if (!S_ISDIR(inode->i_mode) || !inode->i_op->getxattr) 274 if (!S_ISDIR(inode->i_mode) || !inode->i_op->getxattr)
275 return false; 275 return false;
276 276
277 res = inode->i_op->getxattr(dentry, OVL_XATTR_OPAQUE, &val, 1); 277 res = inode->i_op->getxattr(dentry, inode, OVL_XATTR_OPAQUE, &val, 1);
278 if (res == 1 && val == 'y') 278 if (res == 1 && val == 'y')
279 return true; 279 return true;
280 280