Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GFS2] Fix attributes setting logic

Browse source 
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>
This commit is contained in:
Steven Whitehouse 2006-05-12 17:07:56 -04:00
parent 9801f6461e
commit b9cb981310
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/gfs2/ops_file.c
View file

@ -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); gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
error = gfs2_glock_nq_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; return error;
}
flags = ip->i_di.di_flags; flags = ip->i_di.di_flags;
new_flags = (flags & ~mask) | (reqflags & mask); 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; goto out;
if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY)) if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY))
goto out; goto out;
error = gfs2_repermission(inode, MAY_WRITE, NULL); if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
if (error) !capable(CAP_LINUX_IMMUTABLE))
goto out; 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); error = gfs2_trans_begin(sdp, RES_DINODE, 0);
if (error) if (error)