From: Christoph Hellwig <hch@infradead.org>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: xfs-oss <xfs@oss.sgi.com>
Subject: Re: [PATCH] remove forward declarations for ioctl helpers; let "noinline" do the work
Date: Sun, 10 Feb 2008 00:04:46 -0500 [thread overview]
Message-ID: <20080210050446.GA12398@infradead.org> (raw)
In-Reply-To: <47AE0232.9000002@sandeen.net>
On Sat, Feb 09, 2008 at 01:42:42PM -0600, Eric Sandeen wrote:
> (if this one is too purely cosmetic I won't be offended)
>
> The forward declarations for the xfs_ioctl() helpers and
> the associated comment about gcc behavior really aren't
> needed; all of these functions are marked STATIC which
> includes noinline, and the stack usage won't be a problem.
>
> This effectively just removes the forward declarations and
> moves xfs_ioctl() back to the end of the file.
Fine in generaly, but I'm a bit worried about the too cosmetic one.
If the gods at sgi decide it's worth it please get it in ASAP (and
that includes 2.6.25).
>
> Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
>
> ---
>
> xfs_ioctl.c | 563 ++++++++++++++++----------------------
> 1 files changed, 255 insertions(+), 308 deletions(-)
>
> Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_ioctl.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_ioctl.c
> +++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_ioctl.c
> @@ -651,314 +651,6 @@ xfs_attrmulti_by_handle(
> return -error;
> }
>
> -/* prototypes for a few of the stack-hungry cases that have
> - * their own functions. Functions are defined after their use
> - * so gcc doesn't get fancy and inline them with -03 */
> -
> -STATIC int
> -xfs_ioc_space(
> - struct xfs_inode *ip,
> - struct inode *inode,
> - struct file *filp,
> - int flags,
> - unsigned int cmd,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_bulkstat(
> - xfs_mount_t *mp,
> - unsigned int cmd,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_fsgeometry_v1(
> - xfs_mount_t *mp,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_fsgeometry(
> - xfs_mount_t *mp,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_xattr(
> - xfs_inode_t *ip,
> - struct file *filp,
> - unsigned int cmd,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_fsgetxattr(
> - xfs_inode_t *ip,
> - int attr,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_getbmap(
> - struct xfs_inode *ip,
> - int flags,
> - unsigned int cmd,
> - void __user *arg);
> -
> -STATIC int
> -xfs_ioc_getbmapx(
> - struct xfs_inode *ip,
> - void __user *arg);
> -
> -int
> -xfs_ioctl(
> - xfs_inode_t *ip,
> - struct file *filp,
> - int ioflags,
> - unsigned int cmd,
> - void __user *arg)
> -{
> - struct inode *inode = filp->f_path.dentry->d_inode;
> - xfs_mount_t *mp = ip->i_mount;
> - int error;
> -
> - xfs_itrace_entry(XFS_I(inode));
> - switch (cmd) {
> -
> - case XFS_IOC_ALLOCSP:
> - case XFS_IOC_FREESP:
> - case XFS_IOC_RESVSP:
> - case XFS_IOC_UNRESVSP:
> - case XFS_IOC_ALLOCSP64:
> - case XFS_IOC_FREESP64:
> - case XFS_IOC_RESVSP64:
> - case XFS_IOC_UNRESVSP64:
> - /*
> - * Only allow the sys admin to reserve space unless
> - * unwritten extents are enabled.
> - */
> - if (!XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) &&
> - !capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - return xfs_ioc_space(ip, inode, filp, ioflags, cmd, arg);
> -
> - case XFS_IOC_DIOINFO: {
> - struct dioattr da;
> - xfs_buftarg_t *target =
> - XFS_IS_REALTIME_INODE(ip) ?
> - mp->m_rtdev_targp : mp->m_ddev_targp;
> -
> - da.d_mem = da.d_miniosz = 1 << target->bt_sshift;
> - da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
> -
> - if (copy_to_user(arg, &da, sizeof(da)))
> - return -XFS_ERROR(EFAULT);
> - return 0;
> - }
> -
> - case XFS_IOC_FSBULKSTAT_SINGLE:
> - case XFS_IOC_FSBULKSTAT:
> - case XFS_IOC_FSINUMBERS:
> - return xfs_ioc_bulkstat(mp, cmd, arg);
> -
> - case XFS_IOC_FSGEOMETRY_V1:
> - return xfs_ioc_fsgeometry_v1(mp, arg);
> -
> - case XFS_IOC_FSGEOMETRY:
> - return xfs_ioc_fsgeometry(mp, arg);
> -
> - case XFS_IOC_GETVERSION:
> - return put_user(inode->i_generation, (int __user *)arg);
> -
> - case XFS_IOC_FSGETXATTR:
> - return xfs_ioc_fsgetxattr(ip, 0, arg);
> - case XFS_IOC_FSGETXATTRA:
> - return xfs_ioc_fsgetxattr(ip, 1, arg);
> - case XFS_IOC_GETXFLAGS:
> - case XFS_IOC_SETXFLAGS:
> - case XFS_IOC_FSSETXATTR:
> - return xfs_ioc_xattr(ip, filp, cmd, arg);
> -
> - case XFS_IOC_FSSETDM: {
> - struct fsdmidata dmi;
> -
> - if (copy_from_user(&dmi, arg, sizeof(dmi)))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_set_dmattrs(ip, dmi.fsd_dmevmask,
> - dmi.fsd_dmstate);
> - return -error;
> - }
> -
> - case XFS_IOC_GETBMAP:
> - case XFS_IOC_GETBMAPA:
> - return xfs_ioc_getbmap(ip, ioflags, cmd, arg);
> -
> - case XFS_IOC_GETBMAPX:
> - return xfs_ioc_getbmapx(ip, arg);
> -
> - case XFS_IOC_FD_TO_HANDLE:
> - case XFS_IOC_PATH_TO_HANDLE:
> - case XFS_IOC_PATH_TO_FSHANDLE:
> - return xfs_find_handle(cmd, arg);
> -
> - case XFS_IOC_OPEN_BY_HANDLE:
> - return xfs_open_by_handle(mp, arg, filp, inode);
> -
> - case XFS_IOC_FSSETDM_BY_HANDLE:
> - return xfs_fssetdm_by_handle(mp, arg, inode);
> -
> - case XFS_IOC_READLINK_BY_HANDLE:
> - return xfs_readlink_by_handle(mp, arg, inode);
> -
> - case XFS_IOC_ATTRLIST_BY_HANDLE:
> - return xfs_attrlist_by_handle(mp, arg, inode);
> -
> - case XFS_IOC_ATTRMULTI_BY_HANDLE:
> - return xfs_attrmulti_by_handle(mp, arg, inode);
> -
> - case XFS_IOC_SWAPEXT: {
> - error = xfs_swapext((struct xfs_swapext __user *)arg);
> - return -error;
> - }
> -
> - case XFS_IOC_FSCOUNTS: {
> - xfs_fsop_counts_t out;
> -
> - error = xfs_fs_counts(mp, &out);
> - if (error)
> - return -error;
> -
> - if (copy_to_user(arg, &out, sizeof(out)))
> - return -XFS_ERROR(EFAULT);
> - return 0;
> - }
> -
> - case XFS_IOC_SET_RESBLKS: {
> - xfs_fsop_resblks_t inout;
> - __uint64_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (copy_from_user(&inout, arg, sizeof(inout)))
> - return -XFS_ERROR(EFAULT);
> -
> - /* input parameter is passed in resblks field of structure */
> - in = inout.resblks;
> - error = xfs_reserve_blocks(mp, &in, &inout);
> - if (error)
> - return -error;
> -
> - if (copy_to_user(arg, &inout, sizeof(inout)))
> - return -XFS_ERROR(EFAULT);
> - return 0;
> - }
> -
> - case XFS_IOC_GET_RESBLKS: {
> - xfs_fsop_resblks_t out;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - error = xfs_reserve_blocks(mp, NULL, &out);
> - if (error)
> - return -error;
> -
> - if (copy_to_user(arg, &out, sizeof(out)))
> - return -XFS_ERROR(EFAULT);
> -
> - return 0;
> - }
> -
> - case XFS_IOC_FSGROWFSDATA: {
> - xfs_growfs_data_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (copy_from_user(&in, arg, sizeof(in)))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_growfs_data(mp, &in);
> - return -error;
> - }
> -
> - case XFS_IOC_FSGROWFSLOG: {
> - xfs_growfs_log_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (copy_from_user(&in, arg, sizeof(in)))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_growfs_log(mp, &in);
> - return -error;
> - }
> -
> - case XFS_IOC_FSGROWFSRT: {
> - xfs_growfs_rt_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (copy_from_user(&in, arg, sizeof(in)))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_growfs_rt(mp, &in);
> - return -error;
> - }
> -
> - case XFS_IOC_FREEZE:
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (inode->i_sb->s_frozen == SB_UNFROZEN)
> - freeze_bdev(inode->i_sb->s_bdev);
> - return 0;
> -
> - case XFS_IOC_THAW:
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> - if (inode->i_sb->s_frozen != SB_UNFROZEN)
> - thaw_bdev(inode->i_sb->s_bdev, inode->i_sb);
> - return 0;
> -
> - case XFS_IOC_GOINGDOWN: {
> - __uint32_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (get_user(in, (__uint32_t __user *)arg))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_fs_goingdown(mp, in);
> - return -error;
> - }
> -
> - case XFS_IOC_ERROR_INJECTION: {
> - xfs_error_injection_t in;
> -
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - if (copy_from_user(&in, arg, sizeof(in)))
> - return -XFS_ERROR(EFAULT);
> -
> - error = xfs_errortag_add(in.errtag, mp);
> - return -error;
> - }
> -
> - case XFS_IOC_ERROR_CLEARALL:
> - if (!capable(CAP_SYS_ADMIN))
> - return -EPERM;
> -
> - error = xfs_errortag_clearall(mp, 1);
> - return -error;
> -
> - default:
> - return -ENOTTY;
> - }
> -}
> -
> STATIC int
> xfs_ioc_space(
> struct xfs_inode *ip,
> @@ -1332,3 +1024,258 @@ xfs_ioc_getbmapx(
>
> return 0;
> }
> +
> +int
> +xfs_ioctl(
> + xfs_inode_t *ip,
> + struct file *filp,
> + int ioflags,
> + unsigned int cmd,
> + void __user *arg)
> +{
> + struct inode *inode = filp->f_path.dentry->d_inode;
> + xfs_mount_t *mp = ip->i_mount;
> + int error;
> +
> + xfs_itrace_entry(XFS_I(inode));
> + switch (cmd) {
> +
> + case XFS_IOC_ALLOCSP:
> + case XFS_IOC_FREESP:
> + case XFS_IOC_RESVSP:
> + case XFS_IOC_UNRESVSP:
> + case XFS_IOC_ALLOCSP64:
> + case XFS_IOC_FREESP64:
> + case XFS_IOC_RESVSP64:
> + case XFS_IOC_UNRESVSP64:
> + /*
> + * Only allow the sys admin to reserve space unless
> + * unwritten extents are enabled.
> + */
> + if (!XFS_SB_VERSION_HASEXTFLGBIT(&mp->m_sb) &&
> + !capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + return xfs_ioc_space(ip, inode, filp, ioflags, cmd, arg);
> +
> + case XFS_IOC_DIOINFO: {
> + struct dioattr da;
> + xfs_buftarg_t *target =
> + XFS_IS_REALTIME_INODE(ip) ?
> + mp->m_rtdev_targp : mp->m_ddev_targp;
> +
> + da.d_mem = da.d_miniosz = 1 << target->bt_sshift;
> + da.d_maxiosz = INT_MAX & ~(da.d_miniosz - 1);
> +
> + if (copy_to_user(arg, &da, sizeof(da)))
> + return -XFS_ERROR(EFAULT);
> + return 0;
> + }
> +
> + case XFS_IOC_FSBULKSTAT_SINGLE:
> + case XFS_IOC_FSBULKSTAT:
> + case XFS_IOC_FSINUMBERS:
> + return xfs_ioc_bulkstat(mp, cmd, arg);
> +
> + case XFS_IOC_FSGEOMETRY_V1:
> + return xfs_ioc_fsgeometry_v1(mp, arg);
> +
> + case XFS_IOC_FSGEOMETRY:
> + return xfs_ioc_fsgeometry(mp, arg);
> +
> + case XFS_IOC_GETVERSION:
> + return put_user(inode->i_generation, (int __user *)arg);
> +
> + case XFS_IOC_FSGETXATTR:
> + return xfs_ioc_fsgetxattr(ip, 0, arg);
> + case XFS_IOC_FSGETXATTRA:
> + return xfs_ioc_fsgetxattr(ip, 1, arg);
> + case XFS_IOC_GETXFLAGS:
> + case XFS_IOC_SETXFLAGS:
> + case XFS_IOC_FSSETXATTR:
> + return xfs_ioc_xattr(ip, filp, cmd, arg);
> +
> + case XFS_IOC_FSSETDM: {
> + struct fsdmidata dmi;
> +
> + if (copy_from_user(&dmi, arg, sizeof(dmi)))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_set_dmattrs(ip, dmi.fsd_dmevmask,
> + dmi.fsd_dmstate);
> + return -error;
> + }
> +
> + case XFS_IOC_GETBMAP:
> + case XFS_IOC_GETBMAPA:
> + return xfs_ioc_getbmap(ip, ioflags, cmd, arg);
> +
> + case XFS_IOC_GETBMAPX:
> + return xfs_ioc_getbmapx(ip, arg);
> +
> + case XFS_IOC_FD_TO_HANDLE:
> + case XFS_IOC_PATH_TO_HANDLE:
> + case XFS_IOC_PATH_TO_FSHANDLE:
> + return xfs_find_handle(cmd, arg);
> +
> + case XFS_IOC_OPEN_BY_HANDLE:
> + return xfs_open_by_handle(mp, arg, filp, inode);
> +
> + case XFS_IOC_FSSETDM_BY_HANDLE:
> + return xfs_fssetdm_by_handle(mp, arg, inode);
> +
> + case XFS_IOC_READLINK_BY_HANDLE:
> + return xfs_readlink_by_handle(mp, arg, inode);
> +
> + case XFS_IOC_ATTRLIST_BY_HANDLE:
> + return xfs_attrlist_by_handle(mp, arg, inode);
> +
> + case XFS_IOC_ATTRMULTI_BY_HANDLE:
> + return xfs_attrmulti_by_handle(mp, arg, inode);
> +
> + case XFS_IOC_SWAPEXT: {
> + error = xfs_swapext((struct xfs_swapext __user *)arg);
> + return -error;
> + }
> +
> + case XFS_IOC_FSCOUNTS: {
> + xfs_fsop_counts_t out;
> +
> + error = xfs_fs_counts(mp, &out);
> + if (error)
> + return -error;
> +
> + if (copy_to_user(arg, &out, sizeof(out)))
> + return -XFS_ERROR(EFAULT);
> + return 0;
> + }
> +
> + case XFS_IOC_SET_RESBLKS: {
> + xfs_fsop_resblks_t inout;
> + __uint64_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(&inout, arg, sizeof(inout)))
> + return -XFS_ERROR(EFAULT);
> +
> + /* input parameter is passed in resblks field of structure */
> + in = inout.resblks;
> + error = xfs_reserve_blocks(mp, &in, &inout);
> + if (error)
> + return -error;
> +
> + if (copy_to_user(arg, &inout, sizeof(inout)))
> + return -XFS_ERROR(EFAULT);
> + return 0;
> + }
> +
> + case XFS_IOC_GET_RESBLKS: {
> + xfs_fsop_resblks_t out;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + error = xfs_reserve_blocks(mp, NULL, &out);
> + if (error)
> + return -error;
> +
> + if (copy_to_user(arg, &out, sizeof(out)))
> + return -XFS_ERROR(EFAULT);
> +
> + return 0;
> + }
> +
> + case XFS_IOC_FSGROWFSDATA: {
> + xfs_growfs_data_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(&in, arg, sizeof(in)))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_growfs_data(mp, &in);
> + return -error;
> + }
> +
> + case XFS_IOC_FSGROWFSLOG: {
> + xfs_growfs_log_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(&in, arg, sizeof(in)))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_growfs_log(mp, &in);
> + return -error;
> + }
> +
> + case XFS_IOC_FSGROWFSRT: {
> + xfs_growfs_rt_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(&in, arg, sizeof(in)))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_growfs_rt(mp, &in);
> + return -error;
> + }
> +
> + case XFS_IOC_FREEZE:
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (inode->i_sb->s_frozen == SB_UNFROZEN)
> + freeze_bdev(inode->i_sb->s_bdev);
> + return 0;
> +
> + case XFS_IOC_THAW:
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> + if (inode->i_sb->s_frozen != SB_UNFROZEN)
> + thaw_bdev(inode->i_sb->s_bdev, inode->i_sb);
> + return 0;
> +
> + case XFS_IOC_GOINGDOWN: {
> + __uint32_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (get_user(in, (__uint32_t __user *)arg))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_fs_goingdown(mp, in);
> + return -error;
> + }
> +
> + case XFS_IOC_ERROR_INJECTION: {
> + xfs_error_injection_t in;
> +
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + if (copy_from_user(&in, arg, sizeof(in)))
> + return -XFS_ERROR(EFAULT);
> +
> + error = xfs_errortag_add(in.errtag, mp);
> + return -error;
> + }
> +
> + case XFS_IOC_ERROR_CLEARALL:
> + if (!capable(CAP_SYS_ADMIN))
> + return -EPERM;
> +
> + error = xfs_errortag_clearall(mp, 1);
> + return -error;
> +
> + default:
> + return -ENOTTY;
> + }
> +}
> +
>
>
>
---end quoted text---
next prev parent reply other threads:[~2008-02-10 5:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-09 19:42 [PATCH] remove forward declarations for ioctl helpers; let "noinline" do the work Eric Sandeen
2008-02-10 5:04 ` Christoph Hellwig [this message]
2008-02-20 4:03 ` Niv Sardi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080210050446.GA12398@infradead.org \
--to=hch@infradead.org \
--cc=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox