Attachment 241921 Details for Bug 352501 – Patch to remove the directio flag

[patch] Patch to remove the directio flag

remove-directio.diff (text/plain), 4.44 KB, created by Steve Whitehouse on 2007-10-29 14:33:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-10-29 14:33:14 UTC

Size: 4.44 KB

patch

obsolete

>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>index 82dfe9b..e02532a 100644
>--- a/fs/gfs2/incore.h
>+++ b/fs/gfs2/incore.h
>@@ -432,7 +432,6 @@ struct gfs2_tune {
> 	unsigned int gt_quota_quantum; /* Secs between syncs to quota file */
> 	unsigned int gt_atime_quantum; /* Min secs between atime updates */
> 	unsigned int gt_new_files_jdata;
>-	unsigned int gt_new_files_directio;
> 	unsigned int gt_max_readahead; /* Max bytes to read-ahead from disk */
> 	unsigned int gt_lockdump_size;
> 	unsigned int gt_stall_secs; /* Detects trouble! */
>diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
>index 532784e..ba58ac6 100644
>--- a/fs/gfs2/inode.c
>+++ b/fs/gfs2/inode.c
>@@ -771,13 +771,8 @@ static void init_dinode(struct gfs2_inode *dip, struct gfs2_glock *gl,
> 		if ((dip->i_di.di_flags & GFS2_DIF_INHERIT_JDATA) ||
> 		    gfs2_tune_get(sdp, gt_new_files_jdata))
> 			di->di_flags |= cpu_to_be32(GFS2_DIF_JDATA);
>-		if ((dip->i_di.di_flags & GFS2_DIF_INHERIT_DIRECTIO) ||
>-		    gfs2_tune_get(sdp, gt_new_files_directio))
>-			di->di_flags |= cpu_to_be32(GFS2_DIF_DIRECTIO);
> 	} else if (S_ISDIR(mode)) {
> 		di->di_flags |= cpu_to_be32(dip->i_di.di_flags &
>-					    GFS2_DIF_INHERIT_DIRECTIO);
>-		di->di_flags |= cpu_to_be32(dip->i_di.di_flags &
> 					    GFS2_DIF_INHERIT_JDATA);
> 	}
> 
>diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
>index ad5daaa..378e23e 100644
>--- a/fs/gfs2/ops_file.c
>+++ b/fs/gfs2/ops_file.c
>@@ -133,7 +133,6 @@ static const u32 fsflags_to_gfs2[32] = {
> 	[7] = GFS2_DIF_NOATIME,
> 	[12] = GFS2_DIF_EXHASH,
> 	[14] = GFS2_DIF_INHERIT_JDATA,
>-	[20] = GFS2_DIF_INHERIT_DIRECTIO,
> };
> 
> static const u32 gfs2_to_fsflags[32] = {
>@@ -142,7 +141,6 @@ static const u32 gfs2_to_fsflags[32] = {
> 	[gfs2fl_AppendOnly] = FS_APPEND_FL,
> 	[gfs2fl_NoAtime] = FS_NOATIME_FL,
> 	[gfs2fl_ExHash] = FS_INDEX_FL,
>-	[gfs2fl_InheritDirectio] = FS_DIRECTIO_FL,
> 	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
> };
> 
>@@ -160,12 +158,8 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
> 		return error;
> 
> 	fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_di.di_flags);
>-	if (!S_ISDIR(inode->i_mode)) {
>-		if (ip->i_di.di_flags & GFS2_DIF_JDATA)
>-			fsflags |= FS_JOURNAL_DATA_FL;
>-		if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
>-			fsflags |= FS_DIRECTIO_FL;
>-	}
>+	if (!S_ISDIR(inode->i_mode) && ip->i_di.di_flags & GFS2_DIF_JDATA)
>+		fsflags |= FS_JOURNAL_DATA_FL;
> 	if (put_user(fsflags, ptr))
> 		error = -EFAULT;
> 
>@@ -194,13 +188,11 @@ void gfs2_set_inode_flags(struct inode *inode)
> 
> /* Flags that can be set by user space */
> #define GFS2_FLAGS_USER_SET (GFS2_DIF_JDATA|			\
>-			     GFS2_DIF_DIRECTIO|			\
> 			     GFS2_DIF_IMMUTABLE|		\
> 			     GFS2_DIF_APPENDONLY|		\
> 			     GFS2_DIF_NOATIME|			\
> 			     GFS2_DIF_SYNC|			\
> 			     GFS2_DIF_SYSTEM|			\
>-			     GFS2_DIF_INHERIT_DIRECTIO|		\
> 			     GFS2_DIF_INHERIT_JDATA)
> 
> /**
>@@ -285,8 +277,6 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr)
> 	if (!S_ISDIR(inode->i_mode)) {
> 		if (gfsflags & GFS2_DIF_INHERIT_JDATA)
> 			gfsflags ^= (GFS2_DIF_JDATA | GFS2_DIF_INHERIT_JDATA);
>-		if (gfsflags & GFS2_DIF_INHERIT_DIRECTIO)
>-			gfsflags ^= (GFS2_DIF_DIRECTIO | GFS2_DIF_INHERIT_DIRECTIO);
> 		return do_gfs2_set_flags(filp, gfsflags, ~0);
> 	}
> 	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
>@@ -487,11 +477,6 @@ static int gfs2_open(struct inode *inode, struct file *file)
> 			goto fail_gunlock;
> 		}
> 
>-		/* Listen to the Direct I/O flag */
>-
>-		if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
>-			file->f_flags |= O_DIRECT;
>-
> 		gfs2_glock_dq_uninit(&i_gh);
> 	}
> 
>diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
>index 5183dfb..131668e 100644
>--- a/fs/gfs2/super.c
>+++ b/fs/gfs2/super.c
>@@ -69,7 +69,6 @@ void gfs2_tune_init(struct gfs2_tune *gt)
> 	gt->gt_quota_quantum = 60;
> 	gt->gt_atime_quantum = 3600;
> 	gt->gt_new_files_jdata = 0;
>-	gt->gt_new_files_directio = 0;
> 	gt->gt_max_readahead = 1 << 18;
> 	gt->gt_lockdump_size = 131072;
> 	gt->gt_stall_secs = 600;
>diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
>index 06e0b77..9c18f3b 100644
>--- a/fs/gfs2/sys.c
>+++ b/fs/gfs2/sys.c
>@@ -436,7 +436,6 @@ TUNE_ATTR(complain_secs, 0);
> TUNE_ATTR(reclaim_limit, 0);
> TUNE_ATTR(statfs_slow, 0);
> TUNE_ATTR(new_files_jdata, 0);
>-TUNE_ATTR(new_files_directio, 0);
> TUNE_ATTR(quota_simul_sync, 1);
> TUNE_ATTR(quota_cache_secs, 1);
> TUNE_ATTR(stall_secs, 1);
>@@ -467,7 +466,6 @@ static struct attribute *tune_attrs[] = {
> 	&tune_attr_quotad_secs.attr,
> 	&tune_attr_quota_scale.attr,
> 	&tune_attr_new_files_jdata.attr,
>-	&tune_attr_new_files_directio.attr,
> 	NULL,
> };
>

Actions: View | Diff

Attachments on bug 352501: 241921