From 7c0ccbf5e079c278433b416a32a1fa2daea99adf Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 6 Jan 2010 23:09:50 +0100 Subject: [PATCH] --- yaml --- r: 178911 b: refs/heads/master c: e0baec1b63632f25ea8101b76edaca0accc061ec h: refs/heads/master i: 178909: 06f7d9182e0f7480e07c6c38b3e542df51f507c8 178907: 8ea49532876588d72212c6d9fec001002be8dde7 178903: 31be217b6958e4eb6324f28d1284af1c4ef26e8d 178895: c1043892d1baec2de620435215e8f2f61544b4ba 178879: f3f9c9a82fc634754e957d43d183b76a2e728e01 v: v3 --- [refs] | 2 +- trunk/fs/reiserfs/ioctl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6754d0ec559c..201bf5cfe325 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c28705418de012216161b14a2ff1dda3da3d786 +refs/heads/master: e0baec1b63632f25ea8101b76edaca0accc061ec diff --git a/trunk/fs/reiserfs/ioctl.c b/trunk/fs/reiserfs/ioctl.c index ace77451ceb1..f53505de0712 100644 --- a/trunk/fs/reiserfs/ioctl.c +++ b/trunk/fs/reiserfs/ioctl.c @@ -104,9 +104,10 @@ long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) err = put_user(inode->i_generation, (int __user *)arg); break; case REISERFS_IOC_SETVERSION: - if (!is_owner_or_cap(inode)) + if (!is_owner_or_cap(inode)) { err = -EPERM; break; + } err = mnt_want_write(filp->f_path.mnt); if (err) break;