Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1a3d572 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Sage Weil
Browse files

ceph: update for write_inode API change 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 422d2cb8

fs/ceph/caps.c

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/sched.h>

#include <linux/vmalloc.h>

#include <linux/wait.h>

#include <linux/writeback.h>



#include "super.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

 * 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);

	unsigned flush_tid;

	int err = 0;

	int dirty;

	int wait = wbc->sync_mode == WB_SYNC_ALL;



	dout("write_inode %p wait=%d\n", inode, wait);

	if (wait) {

fs/ceph/super.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/mempool.h>

#include <linux/pagemap.h>

#include <linux/wait.h>

#include <linux/writeback.h>



#include "types.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_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 void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,

				    struct ceph_mds_session *session);