git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[sfrench/cifs-2.6.git]
/
fs
/
fat
/
inode.c
diff --git
a/fs/fat/inode.c
b/fs/fat/inode.c
index d0a504c8feef44cabf5e8515bd56d4c55060fe88..0ce143bd7d56a9c387db5dbf6c16624d4cd02e1a 100644
(file)
--- a/
fs/fat/inode.c
+++ b/
fs/fat/inode.c
@@
-577,7
+577,7
@@
static inline loff_t fat_i_pos_read(struct msdos_sb_info *sbi,
return i_pos;
}
return i_pos;
}
-static int fat_write_inode(struct inode *inode, int wait)
+static int
__
fat_write_inode(struct inode *inode, int wait)
{
struct super_block *sb = inode->i_sb;
struct msdos_sb_info *sbi = MSDOS_SB(sb);
{
struct super_block *sb = inode->i_sb;
struct msdos_sb_info *sbi = MSDOS_SB(sb);
@@
-634,9
+634,14
@@
retry:
return err;
}
return err;
}
+static int fat_write_inode(struct inode *inode, struct writeback_control *wbc)
+{
+ return __fat_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
+}
+
int fat_sync_inode(struct inode *inode)
{
int fat_sync_inode(struct inode *inode)
{
- return fat_write_inode(inode, 1);
+ return
__
fat_write_inode(inode, 1);
}
EXPORT_SYMBOL_GPL(fat_sync_inode);
}
EXPORT_SYMBOL_GPL(fat_sync_inode);