aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/ops_file.c')
-rw-r--r--fs/gfs2/ops_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 372dbcb3f7f3..a9ac1358ce21 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -236,7 +236,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
236 error = gfs2_glock_nq_m_atime(1, &gh); 236 error = gfs2_glock_nq_m_atime(1, &gh);
237 if (error) 237 if (error)
238 return error; 238 return error;
239 239
240 iflags = iflags_cvt(gfs2_to_iflags, ip->i_di.di_flags); 240 iflags = iflags_cvt(gfs2_to_iflags, ip->i_di.di_flags);
241 if (put_user(iflags, ptr)) 241 if (put_user(iflags, ptr))
242 error = -EFAULT; 242 error = -EFAULT;
@@ -299,7 +299,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
299 goto out; 299 goto out;
300 if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY)) 300 if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY))
301 goto out; 301 goto out;
302 if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) && 302 if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
303 !capable(CAP_LINUX_IMMUTABLE)) 303 !capable(CAP_LINUX_IMMUTABLE))
304 goto out; 304 goto out;
305 if (!IS_IMMUTABLE(inode)) { 305 if (!IS_IMMUTABLE(inode)) {
@@ -541,7 +541,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
541 goto out; 541 goto out;
542 gfs2_glock_hold(gl); 542 gfs2_glock_hold(gl);
543 flock_lock_file_wait(file, 543 flock_lock_file_wait(file,
544 &(struct file_lock){.fl_type = F_UNLCK}); 544 &(struct file_lock){.fl_type = F_UNLCK});
545 gfs2_glock_dq_uninit(fl_gh); 545 gfs2_glock_dq_uninit(fl_gh);
546 } else { 546 } else {
547 error = gfs2_glock_get(GFS2_SB(&ip->i_inode), 547 error = gfs2_glock_get(GFS2_SB(&ip->i_inode),