Commit 94aabbd9 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove ioctl support 



The various flags on inodes will in future be set and queried
via the extended attributes interface, so this interface is no
longer required.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 9a212471

fs/gfs2/ops_file.c

+0 −95
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/blkdev.h>

#include <linux/mm.h>

#include <linux/smp_lock.h>

#include <linux/gfs2_ioctl.h>

#include <linux/fs.h>

#include <linux/gfs2_ondisk.h>

#include <asm/semaphore.h>
@@ -532,98 +531,6 @@ static int gfs2_readdir(struct file *file, void *dirent, filldir_t filldir) 
	return error;

}



static int gfs2_ioctl_flags(struct gfs2_inode *ip, unsigned int cmd,

			    unsigned long arg)

{

	unsigned int lmode = (cmd == GFS2_IOCTL_SETFLAGS) ?

			     LM_ST_EXCLUSIVE : LM_ST_SHARED;

	struct buffer_head *dibh;

	struct gfs2_holder i_gh;

	int error;

	__u32 flags = 0, change;



	if (cmd == GFS2_IOCTL_SETFLAGS) {

		error = get_user(flags, (__u32 __user *)arg);

		if (error)

			return -EFAULT;

	}



	error = gfs2_glock_nq_init(ip->i_gl, lmode, 0, &i_gh);

	if (error)

		return error;



	if (cmd == GFS2_IOCTL_SETFLAGS) {

		change = flags ^ ip->i_di.di_flags;

		error = -EPERM;

		if (change & (GFS2_DIF_IMMUTABLE|GFS2_DIF_APPENDONLY)) {

			if (!capable(CAP_LINUX_IMMUTABLE))

				goto out;

		}

		error = -EINVAL;

		if (flags & (GFS2_DIF_JDATA|GFS2_DIF_DIRECTIO)) {

			if (!S_ISREG(ip->i_di.di_mode))

				goto out;

		}

		if (flags &

		    (GFS2_DIF_INHERIT_JDATA|GFS2_DIF_INHERIT_DIRECTIO)) {

			if (!S_ISDIR(ip->i_di.di_mode))

				goto out;

		}



		error = gfs2_trans_begin(ip->i_sbd, RES_DINODE, 0);

		if (error)

			goto out;



		error = gfs2_meta_inode_buffer(ip, &dibh);

		if (error)

			goto out_trans_end;



		ip->i_di.di_flags = flags;



		gfs2_trans_add_bh(ip->i_gl, dibh, 1);

        	gfs2_dinode_out(&ip->i_di, dibh->b_data);



        	brelse(dibh);



out_trans_end:

		gfs2_trans_end(ip->i_sbd);

	} else {

		flags = ip->i_di.di_flags;

	}

out:

	gfs2_glock_dq_uninit(&i_gh);

	if (cmd == GFS2_IOCTL_GETFLAGS) {

		if (put_user(flags, (__u32 __user *)arg))

			return -EFAULT;

	}

	return error;

}



/**

 * gfs2_ioctl - do an ioctl on a file

 * @inode: the inode

 * @file: the file pointer

 * @cmd: the ioctl command

 * @arg: the argument

 *

 * Returns: errno

 */



static int gfs2_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

		      unsigned long arg)

{

	struct gfs2_inode *ip = inode->u.generic_ip;



	switch (cmd) {

	case GFS2_IOCTL_SETFLAGS:

	case GFS2_IOCTL_GETFLAGS:

		return gfs2_ioctl_flags(ip, cmd, arg);



	default:

		return -ENOTTY;

	}

}



/**

 * gfs2_mmap -

 * @file: The file to map
@@ -925,7 +832,6 @@ struct file_operations gfs2_file_fops = { 
	.write = generic_file_write,

	.writev = generic_file_writev,

	.aio_write = generic_file_aio_write,

	.ioctl = gfs2_ioctl,

	.mmap = gfs2_mmap,

	.open = gfs2_open,

	.release = gfs2_close,
@@ -937,7 +843,6 @@ struct file_operations gfs2_file_fops = { 


struct file_operations gfs2_dir_fops = {

	.readdir = gfs2_readdir,

	.ioctl = gfs2_ioctl,

	.open = gfs2_open,

	.release = gfs2_close,

	.fsync = gfs2_fsync,

include/linux/gfs2_ioctl.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.

 * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.

 *

 * This copyrighted material is made available to anyone wishing to use,

 * modify, copy, or redistribute it subject to the terms and conditions

 * of the GNU General Public License v.2.

 */



#ifndef __GFS2_IOCTL_DOT_H__

#define __GFS2_IOCTL_DOT_H__



#define GFS2_IOCTL_SETFLAGS	_IOW('g', 3, long)

#define GFS2_IOCTL_GETFLAGS	_IOR('g', 4, long)



#endif /* ___GFS2_IOCTL_DOT_H__ */