Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3954
b: refs/heads/master
c: 869eb76
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Mahoney authored and Linus Torvalds committed Jun 30, 2005
1 parent 85f2295 commit 435b001
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b35ff23b2633eb996d666e5a49a5d49b8a6a2d3
refs/heads/master: 869eb76e7b60ebd8f87a358b72e97fa0aef1d1f5
6 changes: 6 additions & 0 deletions trunk/fs/reiserfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 435b001

Please sign in to comment.