lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Browse Source 
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Fix groups code when num_devices is not divisible by group_width
  exofs: Remove useless optimization
  exofs: exofs_file_fsync and exofs_file_flush correctness
  exofs: Remove superfluous dependency on buffer_head and writeback
This commit is contained in:
Linus Torvalds
2010-08-11 09:19:43 -07:00
parent 682c30ed21 5002dd18c5
commit bf25db3654
4 changed files with 31 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
fs/exofs/file.c
View File

@@ -30,9 +30,6 @@
* along with exofs; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <linux/buffer_head.h>
#include "exofs.h"
static int exofs_release_file(struct inode *inode, struct file *filp)
@@ -40,19 +37,27 @@ static int exofs_release_file(struct inode *inode, struct file *filp)
return 0;
}
/* exofs_file_fsync - flush the inode to disk
*
* Note, in exofs all metadata is written as part of inode, regardless.
* The writeout is synchronous
*/
static int exofs_file_fsync(struct file *filp, int datasync)
{
int ret;
struct address_space *mapping = filp->f_mapping;
struct inode *inode = mapping->host;
struct inode *inode = filp->f_mapping->host;
struct writeback_control wbc = {
.sync_mode = WB_SYNC_ALL,
.nr_to_write = 0, /* metadata-only; caller takes care of data */
};
struct super_block *sb;
ret = filemap_write_and_wait(mapping);
if (ret)
return ret;
if (!(inode->i_state & I_DIRTY))
return 0;
if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
return 0;
/* sync the inode attributes */
ret = write_inode_now(inode, 1);
ret = sync_inode(inode, &wbc);
/* This is a good place to write the sb */
/* TODO: Sechedule an sb-sync on create */
@@ -65,9 +70,9 @@ static int exofs_file_fsync(struct file *filp, int datasync)
static int exofs_flush(struct file *file, fl_owner_t id)
{
exofs_file_fsync(file, 1);
int ret = vfs_fsync(file, 0);
/* TODO: Flush the OSD target */
return 0;
return ret;
}
const struct file_operations exofs_file_operations = {