lkml.org 
[lkml]   [2009]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/49] vfs: Enable FS_IOC_FIEMAP and FIGETBSZ for all filetypes
    Date
    From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

    The fiemap and get_blk_size ioctls should be enabled even for
    directories. So move it outisde file_ioctl.

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    ---
    fs/ioctl.c | 14 ++++++++++----
    1 files changed, 10 insertions(+), 4 deletions(-)

    diff --git a/fs/ioctl.c b/fs/ioctl.c
    index 82d9c42..286f38d 100644
    --- a/fs/ioctl.c
    +++ b/fs/ioctl.c
    @@ -414,10 +414,6 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
    switch (cmd) {
    case FIBMAP:
    return ioctl_fibmap(filp, p);
    - case FS_IOC_FIEMAP:
    - return ioctl_fiemap(filp, arg);
    - case FIGETBSZ:
    - return put_user(inode->i_sb->s_blocksize, p);
    case FIONREAD:
    return put_user(i_size_read(inode) - filp->f_pos, p);
    }
    @@ -557,6 +553,16 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
    error = ioctl_fsthaw(filp);
    break;

    + case FS_IOC_FIEMAP:
    + return ioctl_fiemap(filp, arg);
    +
    + case FIGETBSZ:
    + {
    + struct inode *inode = filp->f_path.dentry->d_inode;
    + int __user *p = (int __user *)arg;
    + return put_user(inode->i_sb->s_blocksize, p);
    + }
    +
    default:
    if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
    error = file_ioctl(filp, cmd, arg);
    --
    1.6.3.2.1.gb9f7d.dirty


    \
     
     \ /
      Last update: 2009-06-08 22:03    [W:0.040 / U:0.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site