Commit 8871d84c authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ubifs: convert to fileattr 



Use the fileattr API to let the VFS handle locking, permission checking and
conversion.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Cc: Richard Weinberger <richard@nod.at>
parent 03eb6066

fs/ubifs/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,8 @@ const struct inode_operations ubifs_dir_inode_operations = { 
	.listxattr   = ubifs_listxattr,

	.update_time = ubifs_update_time,

	.tmpfile     = ubifs_tmpfile,

	.fileattr_get = ubifs_fileattr_get,

	.fileattr_set = ubifs_fileattr_set,

};



const struct file_operations ubifs_dir_operations = {

fs/ubifs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -1648,6 +1648,8 @@ const struct inode_operations ubifs_file_inode_operations = { 
	.getattr     = ubifs_getattr,

	.listxattr   = ubifs_listxattr,

	.update_time = ubifs_update_time,

	.fileattr_get = ubifs_fileattr_get,

	.fileattr_set = ubifs_fileattr_set,

};



const struct inode_operations ubifs_symlink_inode_operations = {

fs/ubifs/ioctl.c

+36 −42
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/compat.h>

#include <linux/mount.h>

#include <linux/fileattr.h>

#include "ubifs.h"



/* Need to be kept consistent with checked flags in ioctl2ubifs() */
@@ -103,7 +104,7 @@ static int ubifs2ioctl(int ubifs_flags) 


static int setflags(struct inode *inode, int flags)

{

	int oldflags, err, release;

	int err, release;

	struct ubifs_inode *ui = ubifs_inode(inode);

	struct ubifs_info *c = inode->i_sb->s_fs_info;

	struct ubifs_budget_req req = { .dirtied_ino = 1,
@@ -114,11 +115,6 @@ static int setflags(struct inode *inode, int flags) 
		return err;



	mutex_lock(&ui->ui_mutex);

	oldflags = ubifs2ioctl(ui->flags);

	err = vfs_ioc_setflags_prepare(inode, oldflags, flags);

	if (err)

		goto out_unlock;



	ui->flags &= ~ioctl2ubifs(UBIFS_SETTABLE_IOCTL_FLAGS);

	ui->flags |= ioctl2ubifs(flags);

	ubifs_set_inode_flags(inode);
@@ -132,54 +128,52 @@ static int setflags(struct inode *inode, int flags) 
	if (IS_SYNC(inode))

		err = write_inode_now(inode, 1);

	return err;



out_unlock:

	mutex_unlock(&ui->ui_mutex);

	ubifs_release_budget(c, &req);

	return err;

}



long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

int ubifs_fileattr_get(struct dentry *dentry, struct fileattr *fa)

{

	int flags, err;

	struct inode *inode = file_inode(file);

	struct inode *inode = d_inode(dentry);

	int flags = ubifs2ioctl(ubifs_inode(inode)->flags);



	switch (cmd) {

	case FS_IOC_GETFLAGS:

		flags = ubifs2ioctl(ubifs_inode(inode)->flags);

	if (d_is_special(dentry))

		return -ENOTTY;



	dbg_gen("get flags: %#x, i_flags %#x", flags, inode->i_flags);

		return put_user(flags, (int __user *) arg);

	fileattr_fill_flags(fa, flags);



	case FS_IOC_SETFLAGS: {

		if (IS_RDONLY(inode))

			return -EROFS;

	return 0;

}



		if (!inode_owner_or_capable(&init_user_ns, inode))

			return -EACCES;

int ubifs_fileattr_set(struct user_namespace *mnt_userns,

		       struct dentry *dentry, struct fileattr *fa)

{

	struct inode *inode = d_inode(dentry);

	int flags = fa->flags;



		if (get_user(flags, (int __user *) arg))

			return -EFAULT;

	if (d_is_special(dentry))

		return -ENOTTY;



	if (fileattr_has_fsx(fa))

		return -EOPNOTSUPP;



	if (flags & ~UBIFS_GETTABLE_IOCTL_FLAGS)

		return -EOPNOTSUPP;



	flags &= UBIFS_SETTABLE_IOCTL_FLAGS;



	if (!S_ISDIR(inode->i_mode))

		flags &= ~FS_DIRSYNC_FL;



		/*

		 * Make sure the file-system is read-write and make sure it

		 * will not become read-only while we are changing the flags.

		 */

		err = mnt_want_write_file(file);

		if (err)

			return err;

	dbg_gen("set flags: %#x, i_flags %#x", flags, inode->i_flags);

		err = setflags(inode, flags);

		mnt_drop_write_file(file);

		return err;

	return setflags(inode, flags);

}



long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	int err;

	struct inode *inode = file_inode(file);



	switch (cmd) {

	case FS_IOC_SET_ENCRYPTION_POLICY: {

		struct ubifs_info *c = inode->i_sb->s_fs_info;

fs/ubifs/ubifs.h

+3 −0
Original line number Diff line number Diff line
@@ -2053,6 +2053,9 @@ int ubifs_recover_size(struct ubifs_info *c, bool in_place); 
void ubifs_destroy_size_tree(struct ubifs_info *c);



/* ioctl.c */

int ubifs_fileattr_get(struct dentry *dentry, struct fileattr *fa);

int ubifs_fileattr_set(struct user_namespace *mnt_userns,

		       struct dentry *dentry, struct fileattr *fa);

long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

void ubifs_set_inode_flags(struct inode *inode);

#ifdef CONFIG_COMPAT