Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit c9f6a6bbc284ba87337876086f7e2e6e0b0d50dd

Authored by Steven Whitehouse
1 parent 9cabcdbd46

[GFS2] Remove support for unused and pointless flag 

The ability to mark files for direct i/o access when opened
normally is both unused and pointless, so this patch removes
support for that feature.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 5 changed files with 2 additions and 26 deletions Side-by-side Diff

... ... @@ -421,7 +421,6 @@
421 421 unsigned int gt_quota_quantum; /* Secs between syncs to quota file */
422 422 unsigned int gt_atime_quantum; /* Min secs between atime updates */
423 423 unsigned int gt_new_files_jdata;
424   - unsigned int gt_new_files_directio;
425 424 unsigned int gt_max_readahead; /* Max bytes to read-ahead from disk */
426 425 unsigned int gt_stall_secs; /* Detects trouble! */
427 426 unsigned int gt_complain_secs;
... ... @@ -789,12 +789,7 @@
789 789 if ((dip->i_di.di_flags & GFS2_DIF_INHERIT_JDATA) ||
790 790 gfs2_tune_get(sdp, gt_new_files_jdata))
791 791 di->di_flags |= cpu_to_be32(GFS2_DIF_JDATA);
792   - if ((dip->i_di.di_flags & GFS2_DIF_INHERIT_DIRECTIO) ||
793   - gfs2_tune_get(sdp, gt_new_files_directio))
794   - di->di_flags |= cpu_to_be32(GFS2_DIF_DIRECTIO);
795 792 } else if (S_ISDIR(mode)) {
796   - di->di_flags |= cpu_to_be32(dip->i_di.di_flags &
797   - GFS2_DIF_INHERIT_DIRECTIO);
798 793 di->di_flags |= cpu_to_be32(dip->i_di.di_flags &
799 794 GFS2_DIF_INHERIT_JDATA);
800 795 }
... ... @@ -134,7 +134,6 @@
134 134 [7] = GFS2_DIF_NOATIME,
135 135 [12] = GFS2_DIF_EXHASH,
136 136 [14] = GFS2_DIF_INHERIT_JDATA,
137   - [20] = GFS2_DIF_INHERIT_DIRECTIO,
138 137 };
139 138  
140 139 static const u32 gfs2_to_fsflags[32] = {
... ... @@ -143,7 +142,6 @@
143 142 [gfs2fl_AppendOnly] = FS_APPEND_FL,
144 143 [gfs2fl_NoAtime] = FS_NOATIME_FL,
145 144 [gfs2fl_ExHash] = FS_INDEX_FL,
146   - [gfs2fl_InheritDirectio] = FS_DIRECTIO_FL,
147 145 [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
148 146 };
149 147  
... ... @@ -161,12 +159,8 @@
161 159 return error;
162 160  
163 161 fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_di.di_flags);
164   - if (!S_ISDIR(inode->i_mode)) {
165   - if (ip->i_di.di_flags & GFS2_DIF_JDATA)
166   - fsflags |= FS_JOURNAL_DATA_FL;
167   - if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
168   - fsflags |= FS_DIRECTIO_FL;
169   - }
  162 + if (!S_ISDIR(inode->i_mode) && ip->i_di.di_flags & GFS2_DIF_JDATA)
  163 + fsflags |= FS_JOURNAL_DATA_FL;
170 164 if (put_user(fsflags, ptr))
171 165 error = -EFAULT;
172 166  
173 167  
... ... @@ -195,13 +189,11 @@
195 189  
196 190 /* Flags that can be set by user space */
197 191 #define GFS2_FLAGS_USER_SET (GFS2_DIF_JDATA| \
198   - GFS2_DIF_DIRECTIO| \
199 192 GFS2_DIF_IMMUTABLE| \
200 193 GFS2_DIF_APPENDONLY| \
201 194 GFS2_DIF_NOATIME| \
202 195 GFS2_DIF_SYNC| \
203 196 GFS2_DIF_SYSTEM| \
204   - GFS2_DIF_INHERIT_DIRECTIO| \
205 197 GFS2_DIF_INHERIT_JDATA)
206 198  
207 199 /**
... ... @@ -292,8 +284,6 @@
292 284 if (!S_ISDIR(inode->i_mode)) {
293 285 if (gfsflags & GFS2_DIF_INHERIT_JDATA)
294 286 gfsflags ^= (GFS2_DIF_JDATA | GFS2_DIF_INHERIT_JDATA);
295   - if (gfsflags & GFS2_DIF_INHERIT_DIRECTIO)
296   - gfsflags ^= (GFS2_DIF_DIRECTIO | GFS2_DIF_INHERIT_DIRECTIO);
297 287 return do_gfs2_set_flags(filp, gfsflags, ~0);
298 288 }
299 289 return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
... ... @@ -493,11 +483,6 @@
493 483 error = -EOVERFLOW;
494 484 goto fail_gunlock;
495 485 }
496   -
497   - /* Listen to the Direct I/O flag */
498   -
499   - if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
500   - file->f_flags |= O_DIRECT;
501 486  
502 487 gfs2_glock_dq_uninit(&i_gh);
503 488 }
... ... @@ -65,7 +65,6 @@
65 65 gt->gt_quota_quantum = 60;
66 66 gt->gt_atime_quantum = 3600;
67 67 gt->gt_new_files_jdata = 0;
68   - gt->gt_new_files_directio = 0;
69 68 gt->gt_max_readahead = 1 << 18;
70 69 gt->gt_stall_secs = 600;
71 70 gt->gt_complain_secs = 10;
... ... @@ -412,7 +412,6 @@
412 412 TUNE_ATTR(complain_secs, 0);
413 413 TUNE_ATTR(statfs_slow, 0);
414 414 TUNE_ATTR(new_files_jdata, 0);
415   -TUNE_ATTR(new_files_directio, 0);
416 415 TUNE_ATTR(quota_simul_sync, 1);
417 416 TUNE_ATTR(quota_cache_secs, 1);
418 417 TUNE_ATTR(stall_secs, 1);
... ... @@ -441,7 +440,6 @@
441 440 &tune_attr_quotad_secs.attr,
442 441 &tune_attr_quota_scale.attr,
443 442 &tune_attr_new_files_jdata.attr,
444   - &tune_attr_new_files_directio.attr,
445 443 NULL,
446 444 };
447 445