Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 799a9d44 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

quota: split out netlink notification support from quota.c 



Instead of adding ifdefs just split it into a new file.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent a56fca23

fs/quota/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ obj-$(CONFIG_QFMT_V1) += quota_v1.o 
obj-$(CONFIG_QFMT_V2)		+= quota_v2.o

obj-$(CONFIG_QUOTA_TREE)	+= quota_tree.o

obj-$(CONFIG_QUOTACTL)		+= quota.o

obj-$(CONFIG_QUOTA_NETLINK_INTERFACE)	+= netlink.o

fs/quota/netlink.c

0 → 100644
+95 −0
Original line number Diff line number Diff line 


#include <linux/cred.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/quotaops.h>

#include <linux/sched.h>

#include <net/netlink.h>

#include <net/genetlink.h>



/* Netlink family structure for quota */

static struct genl_family quota_genl_family = {

	.id = GENL_ID_GENERATE,

	.hdrsize = 0,

	.name = "VFS_DQUOT",

	.version = 1,

	.maxattr = QUOTA_NL_A_MAX,

};



/**

 * quota_send_warning - Send warning to userspace about exceeded quota

 * @type: The quota type: USRQQUOTA, GRPQUOTA,...

 * @id: The user or group id of the quota that was exceeded

 * @dev: The device on which the fs is mounted (sb->s_dev)

 * @warntype: The type of the warning: QUOTA_NL_...

 *

 * This can be used by filesystems (including those which don't use

 * dquot) to send a message to userspace relating to quota limits.

 *

 */



void quota_send_warning(short type, unsigned int id, dev_t dev,

			const char warntype)

{

	static atomic_t seq;

	struct sk_buff *skb;

	void *msg_head;

	int ret;

	int msg_size = 4 * nla_total_size(sizeof(u32)) +

		       2 * nla_total_size(sizeof(u64));



	/* We have to allocate using GFP_NOFS as we are called from a

	 * filesystem performing write and thus further recursion into

	 * the fs to free some data could cause deadlocks. */

	skb = genlmsg_new(msg_size, GFP_NOFS);

	if (!skb) {

		printk(KERN_ERR

		  "VFS: Not enough memory to send quota warning.\n");

		return;

	}

	msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),

			&quota_genl_family, 0, QUOTA_NL_C_WARNING);

	if (!msg_head) {

		printk(KERN_ERR

		  "VFS: Cannot store netlink header in quota warning.\n");

		goto err_out;

	}

	ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, type);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID, id);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MAJOR, MAJOR(dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, current_uid());

	if (ret)

		goto attr_err_out;

	genlmsg_end(skb, msg_head);



	genlmsg_multicast(skb, 0, quota_genl_family.id, GFP_NOFS);

	return;

attr_err_out:

	printk(KERN_ERR "VFS: Not enough space to compose quota message!\n");

err_out:

	kfree_skb(skb);

}

EXPORT_SYMBOL(quota_send_warning);



static int __init quota_init(void)

{

	if (genl_register_family(&quota_genl_family) != 0)

		printk(KERN_ERR

		       "VFS: Failed to create quota netlink interface.\n");

	return 0;

};



module_init(quota_init);

fs/quota/quota.c

+0 −93
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/quotaops.h>

#include <linux/types.h>

#include <linux/writeback.h>

#include <net/netlink.h>

#include <net/genetlink.h>



static int check_quotactl_permission(struct super_block *sb, int type, int cmd,

				     qid_t id)
@@ -458,94 +456,3 @@ asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special, 
	return ret;

}

#endif
 




#ifdef CONFIG_QUOTA_NETLINK_INTERFACE



/* Netlink family structure for quota */

static struct genl_family quota_genl_family = {

	.id = GENL_ID_GENERATE,

	.hdrsize = 0,

	.name = "VFS_DQUOT",

	.version = 1,

	.maxattr = QUOTA_NL_A_MAX,

};



/**

 * quota_send_warning - Send warning to userspace about exceeded quota

 * @type: The quota type: USRQQUOTA, GRPQUOTA,...

 * @id: The user or group id of the quota that was exceeded

 * @dev: The device on which the fs is mounted (sb->s_dev)

 * @warntype: The type of the warning: QUOTA_NL_...

 *

 * This can be used by filesystems (including those which don't use

 * dquot) to send a message to userspace relating to quota limits.

 *

 */



void quota_send_warning(short type, unsigned int id, dev_t dev,

			const char warntype)

{

	static atomic_t seq;

	struct sk_buff *skb;

	void *msg_head;

	int ret;

	int msg_size = 4 * nla_total_size(sizeof(u32)) +

		       2 * nla_total_size(sizeof(u64));



	/* We have to allocate using GFP_NOFS as we are called from a

	 * filesystem performing write and thus further recursion into

	 * the fs to free some data could cause deadlocks. */

	skb = genlmsg_new(msg_size, GFP_NOFS);

	if (!skb) {

		printk(KERN_ERR

		  "VFS: Not enough memory to send quota warning.\n");

		return;

	}

	msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),

			&quota_genl_family, 0, QUOTA_NL_C_WARNING);

	if (!msg_head) {

		printk(KERN_ERR

		  "VFS: Cannot store netlink header in quota warning.\n");

		goto err_out;

	}

	ret = nla_put_u32(skb, QUOTA_NL_A_QTYPE, type);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_EXCESS_ID, id);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_WARNING, warntype);

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MAJOR, MAJOR(dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u32(skb, QUOTA_NL_A_DEV_MINOR, MINOR(dev));

	if (ret)

		goto attr_err_out;

	ret = nla_put_u64(skb, QUOTA_NL_A_CAUSED_ID, current_uid());

	if (ret)

		goto attr_err_out;

	genlmsg_end(skb, msg_head);



	genlmsg_multicast(skb, 0, quota_genl_family.id, GFP_NOFS);

	return;

attr_err_out:

	printk(KERN_ERR "VFS: Not enough space to compose quota message!\n");

err_out:

	kfree_skb(skb);

}

EXPORT_SYMBOL(quota_send_warning);



static int __init quota_init(void)

{

	if (genl_register_family(&quota_genl_family) != 0)

		printk(KERN_ERR

		       "VFS: Failed to create quota netlink interface.\n");

	return 0;

};



module_init(quota_init);

#endif