Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ceph: update for write_inode API change

Browse source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Stephen Rothwell 2010-01-18 11:53:08 +11:00 committed by Sage Weil
parent 422d2cb8f9
commit f1a3d57213
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/ceph/caps.c
View file

@ -5,6 +5,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/writeback.h>
#include "super.h" #include "super.h"
#include "decode.h" #include "decode.h"
@ -1801,12 +1802,13 @@ int ceph_fsync(struct file *file, struct dentry *dentry, int datasync)
* get by with fewer MDS messages if we wait for data writeback to * get by with fewer MDS messages if we wait for data writeback to
* complete first. * complete first.
*/ */
int ceph_write_inode(struct inode *inode, int wait) int ceph_write_inode(struct inode *inode, struct writeback_control *wbc)
{ {
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
unsigned flush_tid; unsigned flush_tid;
int err = 0; int err = 0;
int dirty; int dirty;
int wait = wbc->sync_mode == WB_SYNC_ALL;
dout("write_inode %p wait=%d\n", inode, wait); dout("write_inode %p wait=%d\n", inode, wait);
if (wait) { if (wait) {

3
fs/ceph/super.h
View file

@ -11,6 +11,7 @@
#include <linux/mempool.h> #include <linux/mempool.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/writeback.h>
#include "types.h" #include "types.h"
#include "messenger.h" #include "messenger.h"
@ -811,7 +812,7 @@ static inline void ceph_remove_cap(struct ceph_cap *cap)
extern void ceph_put_cap(struct ceph_cap *cap); extern void ceph_put_cap(struct ceph_cap *cap);
extern void ceph_queue_caps_release(struct inode *inode); extern void ceph_queue_caps_release(struct inode *inode);
extern int ceph_write_inode(struct inode *inode, int unused); extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc);
extern int ceph_fsync(struct file *file, struct dentry *dentry, int datasync); extern int ceph_fsync(struct file *file, struct dentry *dentry, int datasync);
extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc, extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
struct ceph_mds_session *session); struct ceph_mds_session *session);