[PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6] (36695673) · Commits · 戴 / test

fs/cifs/ioctl.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		*/

		#include <linux/fs.h>
		#include <linux/ext2_fs.h>
		#include "cifspdu.h"
		#include "cifsglob.h"
		#include "cifsproto.h"
		@@ -74,7 +73,7 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
		}
		break;
		#ifdef CONFIG_CIFS_POSIX
		case EXT2_IOC_GETFLAGS:
		case FS_IOC_GETFLAGS:
		if(CIFS_UNIX_EXTATTR_CAP & caps) {
		if (pSMBFile == NULL)
		break;
		@@ -82,12 +81,12 @@ int cifs_ioctl (struct inode * inode, struct file * filep,
		&ExtAttrBits, &ExtAttrMask);
		if(rc == 0)
		rc = put_user(ExtAttrBits &
		EXT2_FL_USER_VISIBLE,
		FS_FL_USER_VISIBLE,
		(int __user *)arg);
		}
		break;

		case EXT2_IOC_SETFLAGS:
		case FS_IOC_SETFLAGS:
		if(CIFS_UNIX_EXTATTR_CAP & caps) {
		if(get_user(ExtAttrBits,(int __user *)arg)) {
		rc = -EFAULT;

fs/compat_ioctl.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -123,21 +123,6 @@
		#include <linux/dvb/video.h>
		#include <linux/lp.h>

		/* Aiee. Someone does not find a difference between int and long */
		#define EXT2_IOC32_GETFLAGS _IOR('f', 1, int)
		#define EXT2_IOC32_SETFLAGS _IOW('f', 2, int)
		#define EXT3_IOC32_GETVERSION _IOR('f', 3, int)
		#define EXT3_IOC32_SETVERSION _IOW('f', 4, int)
		#define EXT3_IOC32_GETRSVSZ _IOR('f', 5, int)
		#define EXT3_IOC32_SETRSVSZ _IOW('f', 6, int)
		#define EXT3_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
		#ifdef CONFIG_JBD_DEBUG
		#define EXT3_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
		#endif

		#define EXT2_IOC32_GETVERSION _IOR('v', 1, int)
		#define EXT2_IOC32_SETVERSION _IOW('v', 2, int)

		static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,
		unsigned long arg, struct file *f)
		{

fs/hfsplus/hfsplus_fs.h

+2 −6

Original line number	Diff line number	Diff line
		@@ -246,12 +246,8 @@ struct hfsplus_readdir_data {

		/* ext2 ioctls (EXT2_IOC_GETFLAGS and EXT2_IOC_SETFLAGS) to support
		* chattr/lsattr */
		#define HFSPLUS_IOC_EXT2_GETFLAGS _IOR('f', 1, long)
		#define HFSPLUS_IOC_EXT2_SETFLAGS _IOW('f', 2, long)

		#define EXT2_FLAG_IMMUTABLE 0x00000010 /* Immutable file */
		#define EXT2_FLAG_APPEND 0x00000020 /* writes to file may only append */
		#define EXT2_FLAG_NODUMP 0x00000040 /* do not dump file */
		#define HFSPLUS_IOC_EXT2_GETFLAGS FS_IOC_GETFLAGS
		#define HFSPLUS_IOC_EXT2_SETFLAGS FS_IOC_SETFLAGS


		/*

fs/hfsplus/ioctl.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -28,11 +28,11 @@ int hfsplus_ioctl(struct inode inode, struct file filp, unsigned int cmd,
		case HFSPLUS_IOC_EXT2_GETFLAGS:
		flags = 0;
		if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_IMMUTABLE)
		flags \|= EXT2_FLAG_IMMUTABLE; /* EXT2_IMMUTABLE_FL */
		flags \|= FS_IMMUTABLE_FL; /* EXT2_IMMUTABLE_FL */
		if (HFSPLUS_I(inode).rootflags & HFSPLUS_FLG_APPEND)
		flags \|= EXT2_FLAG_APPEND; /* EXT2_APPEND_FL */
		flags \|= FS_APPEND_FL; /* EXT2_APPEND_FL */
		if (HFSPLUS_I(inode).userflags & HFSPLUS_FLG_NODUMP)
		flags \|= EXT2_FLAG_NODUMP; /* EXT2_NODUMP_FL */
		flags \|= FS_NODUMP_FL; /* EXT2_NODUMP_FL */
		return put_user(flags, (int __user *)arg);
		case HFSPLUS_IOC_EXT2_SETFLAGS: {
		if (IS_RDONLY(inode))
		@@ -44,32 +44,31 @@ int hfsplus_ioctl(struct inode inode, struct file filp, unsigned int cmd,
		if (get_user(flags, (int __user *)arg))
		return -EFAULT;

		if (flags & (EXT2_FLAG_IMMUTABLE\|EXT2_FLAG_APPEND) \|\|
		if (flags & (FS_IMMUTABLE_FL\|FS_APPEND_FL) \|\|
		HFSPLUS_I(inode).rootflags & (HFSPLUS_FLG_IMMUTABLE\|HFSPLUS_FLG_APPEND)) {
		if (!capable(CAP_LINUX_IMMUTABLE))
		return -EPERM;
		}

		/* don't silently ignore unsupported ext2 flags */
		if (flags & ~(EXT2_FLAG_IMMUTABLE\|EXT2_FLAG_APPEND\|
		EXT2_FLAG_NODUMP))
		if (flags & ~(FS_IMMUTABLE_FL\|FS_APPEND_FL\|FS_NODUMP_FL))
		return -EOPNOTSUPP;

		if (flags & EXT2_FLAG_IMMUTABLE) { /* EXT2_IMMUTABLE_FL */
		if (flags & FS_IMMUTABLE_FL) { /* EXT2_IMMUTABLE_FL */
		inode->i_flags \|= S_IMMUTABLE;
		HFSPLUS_I(inode).rootflags \|= HFSPLUS_FLG_IMMUTABLE;
		} else {
		inode->i_flags &= ~S_IMMUTABLE;
		HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_IMMUTABLE;
		}
		if (flags & EXT2_FLAG_APPEND) { /* EXT2_APPEND_FL */
		if (flags & FS_APPEND_FL) { /* EXT2_APPEND_FL */
		inode->i_flags \|= S_APPEND;
		HFSPLUS_I(inode).rootflags \|= HFSPLUS_FLG_APPEND;
		} else {
		inode->i_flags &= ~S_APPEND;
		HFSPLUS_I(inode).rootflags &= ~HFSPLUS_FLG_APPEND;
		}
		if (flags & EXT2_FLAG_NODUMP) /* EXT2_NODUMP_FL */
		if (flags & FS_NODUMP_FL) /* EXT2_NODUMP_FL */
		HFSPLUS_I(inode).userflags \|= HFSPLUS_FLG_NODUMP;
		else
		HFSPLUS_I(inode).userflags &= ~HFSPLUS_FLG_NODUMP;

fs/jfs/ioctl.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		*/

		#include <linux/fs.h>
		#include <linux/ext2_fs.h>
		#include <linux/ctype.h>
		#include <linux/capability.h>
		#include <linux/time.h>
		@@ -22,13 +21,13 @@ static struct {
		long jfs_flag;
		long ext2_flag;
		} jfs_map[] = {
		{JFS_NOATIME_FL, EXT2_NOATIME_FL},
		{JFS_DIRSYNC_FL, EXT2_DIRSYNC_FL},
		{JFS_SYNC_FL, EXT2_SYNC_FL},
		{JFS_SECRM_FL, EXT2_SECRM_FL},
		{JFS_UNRM_FL, EXT2_UNRM_FL},
		{JFS_APPEND_FL, EXT2_APPEND_FL},
		{JFS_IMMUTABLE_FL, EXT2_IMMUTABLE_FL},
		{JFS_NOATIME_FL, FS_NOATIME_FL},
		{JFS_DIRSYNC_FL, FS_DIRSYNC_FL},
		{JFS_SYNC_FL, FS_SYNC_FL},
		{JFS_SECRM_FL, FS_SECRM_FL},
		{JFS_UNRM_FL, FS_UNRM_FL},
		{JFS_APPEND_FL, FS_APPEND_FL},
		{JFS_IMMUTABLE_FL, FS_IMMUTABLE_FL},
		{0, 0},
		};

Admin message