summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-04-25 13:20:27 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-04-25 13:20:27 -0400
commit4bcf7091f9da595016f9d1175aa1bea8e736566f (patch)
treee1ebe2ac39eff1d73b4f974174e3a61682107a10 /fs
parentb5ea3e1ef307548bdd40fff6aba5fc96b002f284 (diff)
downloadop-kernel-dev-4bcf7091f9da595016f9d1175aa1bea8e736566f.zip
op-kernel-dev-4bcf7091f9da595016f9d1175aa1bea8e736566f.tar.gz
[GFS2] Remove inherited flags from exported flags.
We don't need the inherited flags since this action can be implied by setting the flags on directories where they wouldn't otherwise make sense. It reduces the number of extra flags by two. Also updated the list of flags to take account of one extra ext2/3 flag. Cc: Andreas Dilger <adilger@clusterfs.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/ops_file.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 3fb1a29..c2dbc30 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -545,8 +545,6 @@ static const u32 iflags_to_gfs2[32] = {
[iflag_Index] = GFS2_DIF_EXHASH,
[iflag_JournalData] = GFS2_DIF_JDATA,
[iflag_DirectIO] = GFS2_DIF_DIRECTIO,
- [iflag_InheritDirectIO] = GFS2_DIF_INHERIT_DIRECTIO,
- [iflag_InheritJdata] = GFS2_DIF_INHERIT_JDATA,
};
static const u32 gfs2_to_iflags[32] = {
@@ -557,8 +555,8 @@ static const u32 gfs2_to_iflags[32] = {
[gfs2fl_ExHash] = IFLAG_INDEX,
[gfs2fl_Jdata] = IFLAG_JOURNAL_DATA,
[gfs2fl_Directio] = IFLAG_DIRECTIO,
- [gfs2fl_InheritDirectio] = IFLAG_INHERITDIRECTIO,
- [gfs2fl_InheritJdata] = IFLAG_INHERITJDATA,
+ [gfs2fl_InheritDirectio] = IFLAG_DIRECTIO,
+ [gfs2fl_InheritJdata] = IFLAG_JOURNAL_DATA,
};
static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
@@ -621,20 +619,17 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
if ((new_flags ^ flags) == 0)
goto out;
+ if (S_ISDIR(inode->i_mode)) {
+ if ((new_flags ^ flags) & GFS2_DIF_JDATA)
+ new_flags ^= (GFS2_DIF_JDATA|GFS2_DIF_INHERIT_JDATA);
+ if ((new_flags ^ flags) & GFS2_DIF_DIRECTIO)
+ new_flags ^= (GFS2_DIF_DIRECTIO|GFS2_DIF_INHERIT_DIRECTIO);
+ }
+
error = -EINVAL;
if ((new_flags ^ flags) & ~GFS2_FLAGS_USER_SET)
goto out;
- if (S_ISDIR(inode->i_mode)) {
- if ((new_flags ^ flags) & (GFS2_DIF_JDATA | GFS2_DIF_DIRECTIO))
- goto out;
- } else if (S_ISREG(inode->i_mode)) {
- if ((new_flags ^ flags) & (GFS2_DIF_INHERIT_DIRECTIO|
- GFS2_DIF_INHERIT_JDATA))
- goto out;
- } else
- goto out;
-
error = -EPERM;
if (IS_IMMUTABLE(inode) && (new_flags & GFS2_DIF_IMMUTABLE))
goto out;
OpenPOWER on IntegriCloud