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

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Convert quota statistics to generic percpu_counter
  ext3 uses rb_node = NULL; to zero rb_root.
  quota: Fixup dquot_transfer
  reiserfs: Fix resuming of quotas on remount read-write
  pohmelfs: Remove dead quota code
  ufs: Remove dead quota code
  udf: Remove dead quota code
  quota: rename default quotactl methods to dquot_
  quota: explicitly set ->dq_op and ->s_qcop
  quota: drop remount argument to ->quota_on and ->quota_off
  quota: move unmount handling into the filesystem
  quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
  quota: move remount handling into the filesystem
  ocfs2: Fix use after free on remount read-only

Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
parents 021fad8b f32764bd

drivers/staging/pohmelfs/inode.c

+0 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/slab.h>

#include <linux/statfs.h>

#include <linux/writeback.h>

#include <linux/quotaops.h>



#include "netfs.h"
@@ -969,13 +968,6 @@ int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr) 
		goto err_out_exit;

	}



	if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||

	    (attr->ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {

		err = dquot_transfer(inode, attr);

		if (err)

			goto err_out_exit;

	}



	err = inode_setattr(inode, attr);

	if (err) {

		dprintk("%s: ino: %llu, failed to set the attributes.\n", __func__, POHMELFS_I(inode)->ino);

fs/ext2/super.c

+20 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static void ext2_put_super (struct super_block * sb) 
	int i;

	struct ext2_sb_info *sbi = EXT2_SB(sb);



	dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);



	if (sb->s_dirt)

		ext2_write_super(sb);
@@ -1063,6 +1065,12 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_op = &ext2_sops;

	sb->s_export_op = &ext2_export_ops;

	sb->s_xattr = ext2_xattr_handlers;



#ifdef CONFIG_QUOTA

	sb->dq_op = &dquot_operations;

	sb->s_qcop = &dquot_quotactl_ops;

#endif



	root = ext2_iget(sb, EXT2_ROOT_INO);

	if (IS_ERR(root)) {

		ret = PTR_ERR(root);
@@ -1241,6 +1249,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) 
			spin_unlock(&sbi->s_lock);

			return 0;

		}



		/*

		 * OK, we are remounting a valid rw partition rdonly, so set

		 * the rdonly flag and then mark the partition as valid again.
@@ -1248,6 +1257,13 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) 
		es->s_state = cpu_to_le16(sbi->s_mount_state);

		es->s_mtime = cpu_to_le32(get_seconds());

		spin_unlock(&sbi->s_lock);



		err = dquot_suspend(sb, -1);

		if (err < 0) {

			spin_lock(&sbi->s_lock);

			goto restore_opts;

		}



		ext2_sync_super(sb, es, 1);

	} else {

		__le32 ret = EXT2_HAS_RO_COMPAT_FEATURE(sb,
@@ -1269,8 +1285,12 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data) 
		if (!ext2_setup_super (sb, es, 0))

			sb->s_flags &= ~MS_RDONLY;

		spin_unlock(&sbi->s_lock);



		ext2_write_super(sb);



		dquot_resume(sb, -1);

	}



	return 0;

restore_opts:

	sbi->s_mount_opt = old_opts.s_mount_opt;

fs/ext3/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static void free_rb_tree_fname(struct rb_root *root) 
			kfree (old);

		}

		if (!parent)

			root->rb_node = NULL;

			*root = RB_ROOT;

		else if (parent->rb_left == n)

			parent->rb_left = NULL;

		else if (parent->rb_right == n)

fs/ext3/super.c

+23 −15
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ static void ext3_put_super (struct super_block * sb) 
	struct ext3_super_block *es = sbi->s_es;

	int i, err;



	dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);



	lock_kernel();



	ext3_xattr_put_super(sb);
@@ -748,7 +750,7 @@ static int ext3_release_dquot(struct dquot *dquot); 
static int ext3_mark_dquot_dirty(struct dquot *dquot);

static int ext3_write_info(struct super_block *sb, int type);

static int ext3_quota_on(struct super_block *sb, int type, int format_id,

				char *path, int remount);

				char *path);

static int ext3_quota_on_mount(struct super_block *sb, int type);

static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,

			       size_t len, loff_t off);
@@ -767,12 +769,12 @@ static const struct dquot_operations ext3_quota_operations = { 


static const struct quotactl_ops ext3_qctl_operations = {

	.quota_on	= ext3_quota_on,

	.quota_off	= vfs_quota_off,

	.quota_sync	= vfs_quota_sync,

	.get_info	= vfs_get_dqinfo,

	.set_info	= vfs_set_dqinfo,

	.get_dqblk	= vfs_get_dqblk,

	.set_dqblk	= vfs_set_dqblk

	.quota_off	= dquot_quota_off,

	.quota_sync	= dquot_quota_sync,

	.get_info	= dquot_get_dqinfo,

	.set_info	= dquot_set_dqinfo,

	.get_dqblk	= dquot_get_dqblk,

	.set_dqblk	= dquot_set_dqblk

};

#endif
@@ -1527,7 +1529,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, 
	/* Turn quotas off */

	for (i = 0; i < MAXQUOTAS; i++) {

		if (sb_dqopt(sb)->files[i])

			vfs_quota_off(sb, i, 0);

			dquot_quota_off(sb, i);

	}

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -2551,6 +2553,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
	ext3_fsblk_t n_blocks_count = 0;

	unsigned long old_sb_flags;

	struct ext3_mount_options old_opts;

	int enable_quota = 0;

	int err;

#ifdef CONFIG_QUOTA

	int i;
@@ -2597,6 +2600,10 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
		}



		if (*flags & MS_RDONLY) {

			err = dquot_suspend(sb, -1);

			if (err < 0)

				goto restore_opts;



			/*

			 * First of all, the unconditional stuff we have to do

			 * to disable replay of the journal when we next remount
@@ -2651,6 +2658,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
				goto restore_opts;

			if (!ext3_setup_super (sb, es, 0))

				sb->s_flags &= ~MS_RDONLY;

			enable_quota = 1;

		}

	}

#ifdef CONFIG_QUOTA
@@ -2662,6 +2670,9 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
#endif

	unlock_super(sb);

	unlock_kernel();



	if (enable_quota)

		dquot_resume(sb, -1);

	return 0;

restore_opts:

	sb->s_flags = old_sb_flags;
@@ -2851,7 +2862,7 @@ static int ext3_write_info(struct super_block *sb, int type) 
 */

static int ext3_quota_on_mount(struct super_block *sb, int type)

{

	return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],

	return dquot_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],

					EXT3_SB(sb)->s_jquota_fmt, type);

}
@@ -2859,16 +2870,13 @@ static int ext3_quota_on_mount(struct super_block *sb, int type) 
 * Standard function to be called on quota_on

 */

static int ext3_quota_on(struct super_block *sb, int type, int format_id,

			 char *name, int remount)

			 char *name)

{

	int err;

	struct path path;



	if (!test_opt(sb, QUOTA))

		return -EINVAL;

	/* When remounting, no checks are needed and in fact, name is NULL */

	if (remount)

		return vfs_quota_on(sb, type, format_id, name, remount);



	err = kern_path(name, LOOKUP_FOLLOW, &path);

	if (err)
@@ -2906,7 +2914,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id, 
		}

	}



	err = vfs_quota_on_path(sb, type, format_id, &path);

	err = dquot_quota_on_path(sb, type, format_id, &path);

	path_put(&path);

	return err;

}

fs/ext4/super.c

+22 −15
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ static void ext4_put_super(struct super_block *sb) 
	struct ext4_super_block *es = sbi->s_es;

	int i, err;



	dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);



	flush_workqueue(sbi->dio_unwritten_wq);

	destroy_workqueue(sbi->dio_unwritten_wq);
@@ -1062,7 +1064,7 @@ static int ext4_release_dquot(struct dquot *dquot); 
static int ext4_mark_dquot_dirty(struct dquot *dquot);

static int ext4_write_info(struct super_block *sb, int type);

static int ext4_quota_on(struct super_block *sb, int type, int format_id,

				char *path, int remount);

				char *path);

static int ext4_quota_on_mount(struct super_block *sb, int type);

static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,

			       size_t len, loff_t off);
@@ -1084,12 +1086,12 @@ static const struct dquot_operations ext4_quota_operations = { 


static const struct quotactl_ops ext4_qctl_operations = {

	.quota_on	= ext4_quota_on,

	.quota_off	= vfs_quota_off,

	.quota_sync	= vfs_quota_sync,

	.get_info	= vfs_get_dqinfo,

	.set_info	= vfs_set_dqinfo,

	.get_dqblk	= vfs_get_dqblk,

	.set_dqblk	= vfs_set_dqblk

	.quota_off	= dquot_quota_off,

	.quota_sync	= dquot_quota_sync,

	.get_info	= dquot_get_dqinfo,

	.set_info	= dquot_set_dqinfo,

	.get_dqblk	= dquot_get_dqblk,

	.set_dqblk	= dquot_set_dqblk

};

#endif
@@ -2054,7 +2056,7 @@ static void ext4_orphan_cleanup(struct super_block *sb, 
	/* Turn quotas off */

	for (i = 0; i < MAXQUOTAS; i++) {

		if (sb_dqopt(sb)->files[i])

			vfs_quota_off(sb, i, 0);

			dquot_quota_off(sb, i);

	}

#endif

	sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -3576,6 +3578,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	ext4_fsblk_t n_blocks_count = 0;

	unsigned long old_sb_flags;

	struct ext4_mount_options old_opts;

	int enable_quota = 0;

	ext4_group_t g;

	unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;

	int err;
@@ -3633,6 +3636,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		}



		if (*flags & MS_RDONLY) {

			err = dquot_suspend(sb, -1);

			if (err < 0)

				goto restore_opts;



			/*

			 * First of all, the unconditional stuff we have to do

			 * to disable replay of the journal when we next remount
@@ -3701,6 +3708,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
				goto restore_opts;

			if (!ext4_setup_super(sb, es, 0))

				sb->s_flags &= ~MS_RDONLY;

			enable_quota = 1;

		}

	}

	ext4_setup_system_zone(sb);
@@ -3716,6 +3724,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
#endif

	unlock_super(sb);

	unlock_kernel();

	if (enable_quota)

		dquot_resume(sb, -1);



	ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);

	kfree(orig_data);
@@ -3913,7 +3923,7 @@ static int ext4_write_info(struct super_block *sb, int type) 
 */

static int ext4_quota_on_mount(struct super_block *sb, int type)

{

	return vfs_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],

	return dquot_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],

					EXT4_SB(sb)->s_jquota_fmt, type);

}
@@ -3921,16 +3931,13 @@ static int ext4_quota_on_mount(struct super_block *sb, int type) 
 * Standard function to be called on quota_on

 */

static int ext4_quota_on(struct super_block *sb, int type, int format_id,

			 char *name, int remount)

			 char *name)

{

	int err;

	struct path path;



	if (!test_opt(sb, QUOTA))

		return -EINVAL;

	/* When remounting, no checks are needed and in fact, name is NULL */

	if (remount)

		return vfs_quota_on(sb, type, format_id, name, remount);



	err = kern_path(name, LOOKUP_FOLLOW, &path);

	if (err)
@@ -3969,7 +3976,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, 
		}

	}



	err = vfs_quota_on_path(sb, type, format_id, &path);

	err = dquot_quota_on_path(sb, type, format_id, &path);

	path_put(&path);

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE