summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-05-12 17:07:56 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-05-12 17:07:56 -0400
commitb9cb981310bc22f165726e99385c2d85196e2f41 (patch)
treeb78165244d7dd54f9d73f637079a66ec4c7e838a /fs
parent9801f6461eb994e4eda29cba97f4596dffafbf32 (diff)
downloadop-kernel-dev-b9cb981310bc22f165726e99385c2d85196e2f41.zip
op-kernel-dev-b9cb981310bc22f165726e99385c2d85196e2f41.tar.gz
[GFS2] Fix attributes setting logic
The attributes logic for immutable was wrong so that there was not way to remove this attribute once set. This fixes the bug. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/ops_file.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index c2dbc30..cf72480 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -611,8 +611,10 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
- if (error)
+ if (error) {
+ gfs2_holder_uninit(&gh);
return error;
+ }
flags = ip->i_di.di_flags;
new_flags = (flags & ~mask) | (reqflags & mask);
@@ -635,9 +637,14 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
goto out;
if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY))
goto out;
- error = gfs2_repermission(inode, MAY_WRITE, NULL);
- if (error)
+ if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
+ !capable(CAP_LINUX_IMMUTABLE))
goto out;
+ if (!IS_IMMUTABLE(inode)) {
+ error = gfs2_repermission(inode, MAY_WRITE, NULL);
+ if (error)
+ goto out;
+ }
error = gfs2_trans_begin(sdp, RES_DINODE, 0);
if (error)
OpenPOWER on IntegriCloud