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, 4 insertions, 2 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 989f0f70fc2e..e6ae2551b0cb 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -531,7 +531,8 @@ static int gfs2_readdir(struct file *file, void *dirent, filldir_t filldir)
531static int gfs2_ioctl_flags(struct gfs2_inode *ip, unsigned int cmd, 531static int gfs2_ioctl_flags(struct gfs2_inode *ip, unsigned int cmd,
532 unsigned long arg) 532 unsigned long arg)
533{ 533{
534 unsigned int lmode = (cmd == GFS2_IOCTL_SETFLAGS) ? LM_ST_EXCLUSIVE : LM_ST_SHARED; 534 unsigned int lmode = (cmd == GFS2_IOCTL_SETFLAGS) ?
535 LM_ST_EXCLUSIVE : LM_ST_SHARED;
535 struct buffer_head *dibh; 536 struct buffer_head *dibh;
536 struct gfs2_holder i_gh; 537 struct gfs2_holder i_gh;
537 int error; 538 int error;
@@ -559,7 +560,8 @@ static int gfs2_ioctl_flags(struct gfs2_inode *ip, unsigned int cmd,
559 if (!S_ISREG(ip->i_di.di_mode)) 560 if (!S_ISREG(ip->i_di.di_mode))
560 goto out; 561 goto out;
561 } 562 }
562 if (flags & (GFS2_DIF_INHERIT_JDATA|GFS2_DIF_INHERIT_DIRECTIO)) { 563 if (flags &
564 (GFS2_DIF_INHERIT_JDATA|GFS2_DIF_INHERIT_DIRECTIO)) {
563 if (!S_ISDIR(ip->i_di.di_mode)) 565 if (!S_ISDIR(ip->i_di.di_mode))
564 goto out; 566 goto out;
565 } 567 }