Commit df922075 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  BKL-removal: Implement a compat_ioctl handler for JFS
  BKL-removal: Use unlocked_ioctl for jfs
parents 6e5565f9 ef1fc2f0

fs/jfs/file.c

+4 −1
Original line number Diff line number Diff line
@@ -112,5 +112,8 @@ const struct file_operations jfs_file_operations = { 
	.splice_write	= generic_file_splice_write,

	.fsync		= jfs_fsync,

	.release	= jfs_release,

	.ioctl		= jfs_ioctl,

	.unlocked_ioctl = jfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= jfs_compat_ioctl,

#endif

};

fs/jfs/ioctl.c

+28 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ static long jfs_map_ext2(unsigned long flags, int from) 
}





int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd,

		unsigned long arg)

long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct jfs_inode_info *jfs_inode = JFS_IP(inode);

	unsigned int flags;
@@ -82,6 +82,10 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
		/* Is it quota file? Do not allow user to mess with it */

		if (IS_NOQUOTA(inode))

			return -EPERM;



		/* Lock against other parallel changes of flags */

		mutex_lock(&inode->i_mutex);



		jfs_get_inode_flags(jfs_inode);

		oldflags = jfs_inode->mode2;
@@ -92,15 +96,18 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
		if ((oldflags & JFS_IMMUTABLE_FL) ||

			((flags ^ oldflags) &

			(JFS_APPEND_FL | JFS_IMMUTABLE_FL))) {

			if (!capable(CAP_LINUX_IMMUTABLE))

			if (!capable(CAP_LINUX_IMMUTABLE)) {

				mutex_unlock(&inode->i_mutex);

				return -EPERM;

			}

		}



		flags = flags & JFS_FL_USER_MODIFIABLE;

		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;

		jfs_inode->mode2 = flags;



		jfs_set_inode_flags(inode);

		mutex_unlock(&inode->i_mutex);

		inode->i_ctime = CURRENT_TIME_SEC;

		mark_inode_dirty(inode);

		return 0;
@@ -110,3 +117,21 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, 
	}

}



#ifdef CONFIG_COMPAT

long jfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	/* While these ioctl numbers defined with 'long' and have different

	 * numbers than the 64bit ABI,

	 * the actual implementation only deals with ints and is compatible.

	 */

	switch (cmd) {

	case JFS_IOC_GETFLAGS32:

		cmd = JFS_IOC_GETFLAGS;

		break;

	case JFS_IOC_SETFLAGS32:

		cmd = JFS_IOC_SETFLAGS;

		break;

	}

	return jfs_ioctl(filp, cmd, arg);

}

#endif

fs/jfs/jfs_dinode.h

+2 −0
Original line number Diff line number Diff line
@@ -170,5 +170,7 @@ struct dinode { 
#define JFS_IOC_GETFLAGS	_IOR('f', 1, long)

#define JFS_IOC_SETFLAGS	_IOW('f', 2, long)



#define JFS_IOC_GETFLAGS32	_IOR('f', 1, int)

#define JFS_IOC_SETFLAGS32	_IOW('f', 2, int)



#endif /*_H_JFS_DINODE */

fs/jfs/jfs_inode.h

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ struct fid; 


extern struct inode *ialloc(struct inode *, umode_t);

extern int jfs_fsync(struct file *, struct dentry *, int);

extern int jfs_ioctl(struct inode *, struct file *,

			unsigned int, unsigned long);

extern long jfs_ioctl(struct file *, unsigned int, unsigned long);

extern long jfs_compat_ioctl(struct file *, unsigned int, unsigned long);

extern struct inode *jfs_iget(struct super_block *, unsigned long);

extern int jfs_commit_inode(struct inode *, int);

extern int jfs_write_inode(struct inode*, int);

fs/jfs/namei.c

+4 −1
Original line number Diff line number Diff line
@@ -1556,7 +1556,10 @@ const struct file_operations jfs_dir_operations = { 
	.read		= generic_read_dir,

	.readdir	= jfs_readdir,

	.fsync		= jfs_fsync,

	.ioctl		= jfs_ioctl,

	.unlocked_ioctl = jfs_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= jfs_compat_ioctl,

#endif

};



static int jfs_ci_hash(struct dentry *dir, struct qstr *this)