From 435b001bae6e8fc539d33648c9a29420a60bee58 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 29 Jun 2005 18:52:28 -0400 Subject: [PATCH] --- yaml --- r: 3954 b: refs/heads/master c: 869eb76e7b60ebd8f87a358b72e97fa0aef1d1f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/ioctl.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9c4bdf6eb604..a616f725d10a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3 +refs/heads/master: 869eb76e7b60ebd8f87a358b72e97fa0aef1d1f5 diff --git a/trunk/fs/reiserfs/ioctl.c b/trunk/fs/reiserfs/ioctl.c index 94dc42475a04..76caedf737f2 100644 --- a/trunk/fs/reiserfs/ioctl.c +++ b/trunk/fs/reiserfs/ioctl.c @@ -36,10 +36,16 @@ int reiserfs_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, /* following two cases are taken from fs/ext2/ioctl.c by Remy Card (card@masi.ibp.fr) */ case REISERFS_IOC_GETFLAGS: + if (!reiserfs_attrs (inode->i_sb)) + return -ENOTTY; + flags = REISERFS_I(inode) -> i_attrs; i_attrs_to_sd_attrs( inode, ( __u16 * ) &flags ); return put_user(flags, (int __user *) arg); case REISERFS_IOC_SETFLAGS: { + if (!reiserfs_attrs (inode->i_sb)) + return -ENOTTY; + if (IS_RDONLY(inode)) return -EROFS;