mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
This commit is contained in:
commit
84695ffee7
107 changed files with 414 additions and 458 deletions
|
|
@ -203,8 +203,6 @@ struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
|
|||
acl = ERR_PTR(rc);
|
||||
}
|
||||
kfree(value);
|
||||
if (!IS_ERR(acl))
|
||||
set_cached_acl(inode, type, acl);
|
||||
return acl;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
|
|||
|
||||
static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct dentry *dentry)
|
||||
{
|
||||
struct jffs2_sb_info *c = JFFS2_SB_INFO(d_inode(old_dentry)->i_sb);
|
||||
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dentry->d_sb);
|
||||
struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(old_dentry));
|
||||
struct jffs2_inode_info *dir_f = JFFS2_INODE_INFO(dir_i);
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ int jffs2_init_security(struct inode *inode, struct inode *dir,
|
|||
|
||||
/* ---- XATTR Handler for "security.*" ----------------- */
|
||||
static int jffs2_security_getxattr(const struct xattr_handler *handler,
|
||||
struct dentry *dentry, const char *name,
|
||||
void *buffer, size_t size)
|
||||
struct dentry *unused, struct inode *inode,
|
||||
const char *name, void *buffer, size_t size)
|
||||
{
|
||||
return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_SECURITY,
|
||||
return do_jffs2_getxattr(inode, JFFS2_XPREFIX_SECURITY,
|
||||
name, buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ static struct dentry *jffs2_get_parent(struct dentry *child)
|
|||
JFFS2_DEBUG("Parent of directory ino #%u is #%u\n",
|
||||
f->inocache->ino, pino);
|
||||
|
||||
return d_obtain_alias(jffs2_iget(d_inode(child)->i_sb, pino));
|
||||
return d_obtain_alias(jffs2_iget(child->d_sb, pino));
|
||||
}
|
||||
|
||||
static const struct export_operations jffs2_export_ops = {
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
#include "nodelist.h"
|
||||
|
||||
static int jffs2_trusted_getxattr(const struct xattr_handler *handler,
|
||||
struct dentry *dentry, const char *name,
|
||||
void *buffer, size_t size)
|
||||
struct dentry *unused, struct inode *inode,
|
||||
const char *name, void *buffer, size_t size)
|
||||
{
|
||||
return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_TRUSTED,
|
||||
return do_jffs2_getxattr(inode, JFFS2_XPREFIX_TRUSTED,
|
||||
name, buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
#include "nodelist.h"
|
||||
|
||||
static int jffs2_user_getxattr(const struct xattr_handler *handler,
|
||||
struct dentry *dentry, const char *name,
|
||||
void *buffer, size_t size)
|
||||
struct dentry *unused, struct inode *inode,
|
||||
const char *name, void *buffer, size_t size)
|
||||
{
|
||||
return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_USER,
|
||||
return do_jffs2_getxattr(inode, JFFS2_XPREFIX_USER,
|
||||
name, buffer, size);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue