Commit 97e2dee9 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ecryptfs: stack fileattr ops 



Add stacking for the fileattr operations.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Cc: Tyler Hicks <code@tyhicks.com>
parent 4c5b4799

fs/ecryptfs/inode.c

+22 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/fs_stack.h>

#include <linux/fs_stack.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/xattr.h>

#include <linux/xattr.h>

#include <linux/fileattr.h>

#include <asm/unaligned.h>

#include <asm/unaligned.h>

#include "ecryptfs_kernel.h"

#include "ecryptfs_kernel.h"
@@ -1118,6 +1119,23 @@ static int ecryptfs_removexattr(struct dentry *dentry, struct inode *inode, 
	return rc;

	return rc;

}

}





static int ecryptfs_fileattr_get(struct dentry *dentry, struct fileattr *fa)

{

	return vfs_fileattr_get(ecryptfs_dentry_to_lower(dentry), fa);

}



static int ecryptfs_fileattr_set(struct user_namespace *mnt_userns,

				 struct dentry *dentry, struct fileattr *fa)

{

	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);

	int rc;



	rc = vfs_fileattr_set(&init_user_ns, lower_dentry, fa);

	fsstack_copy_attr_all(d_inode(dentry), d_inode(lower_dentry));



	return rc;

}



const struct inode_operations ecryptfs_symlink_iops = {

const struct inode_operations ecryptfs_symlink_iops = {

	.get_link = ecryptfs_get_link,

	.get_link = ecryptfs_get_link,

	.permission = ecryptfs_permission,

	.permission = ecryptfs_permission,
@@ -1139,6 +1157,8 @@ const struct inode_operations ecryptfs_dir_iops = { 
	.permission = ecryptfs_permission,

	.permission = ecryptfs_permission,

	.setattr = ecryptfs_setattr,

	.setattr = ecryptfs_setattr,

	.listxattr = ecryptfs_listxattr,

	.listxattr = ecryptfs_listxattr,

	.fileattr_get = ecryptfs_fileattr_get,

	.fileattr_set = ecryptfs_fileattr_set,

};

};





const struct inode_operations ecryptfs_main_iops = {

const struct inode_operations ecryptfs_main_iops = {
@@ -1146,6 +1166,8 @@ const struct inode_operations ecryptfs_main_iops = { 
	.setattr = ecryptfs_setattr,

	.setattr = ecryptfs_setattr,

	.getattr = ecryptfs_getattr,

	.getattr = ecryptfs_getattr,

	.listxattr = ecryptfs_listxattr,

	.listxattr = ecryptfs_listxattr,

	.fileattr_get = ecryptfs_fileattr_get,

	.fileattr_set = ecryptfs_fileattr_set,

};

};





static int ecryptfs_xattr_get(const struct xattr_handler *handler,

static int ecryptfs_xattr_get(const struct xattr_handler *handler,