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

Commit 0ebc115d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: nwname should be an unsigned int
  9p: Fix sparse error
  fs/9p: Fix error reported by coccicheck
  9p: revert tsyncfs related changes
  fs/9p: Use write_inode for data sync on server
  fs/9p: Fix revalidate to return correct value
parents e82e6f16 b76225e2

fs/9p/fid.c

+2 −13
Original line number Diff line number Diff line
@@ -286,11 +286,9 @@ static struct p9_fid *v9fs_fid_clone_with_uid(struct dentry *dentry, uid_t uid) 


struct p9_fid *v9fs_writeback_fid(struct dentry *dentry)

{

	int err, flags;

	int err;

	struct p9_fid *fid;

	struct v9fs_session_info *v9ses;



	v9ses = v9fs_dentry2v9ses(dentry);

	fid = v9fs_fid_clone_with_uid(dentry, 0);

	if (IS_ERR(fid))

		goto error_out;
@@ -299,17 +297,8 @@ struct p9_fid *v9fs_writeback_fid(struct dentry *dentry) 
	 * dirty pages. We always request for the open fid in read-write

	 * mode so that a partial page write which result in page

	 * read can work.

	 *

	 * we don't have a tsyncfs operation for older version

	 * of protocol. So make sure the write back fid is

	 * opened in O_SYNC mode.

	 */

	if (!v9fs_proto_dotl(v9ses))

		flags = O_RDWR | O_SYNC;

	else

		flags = O_RDWR;



	err = p9_client_open(fid, flags);

	err = p9_client_open(fid, O_RDWR);

	if (err < 0) {

		p9_client_clunk(fid);

		fid = ERR_PTR(err);

fs/9p/v9fs.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ struct v9fs_session_info { 
	struct list_head slist; /* list of sessions registered with v9fs */

	struct backing_dev_info bdi;

	struct rw_semaphore rename_sem;

	struct p9_fid *root_fid; /* Used for file system sync */

};



/* cache_validity flags */

fs/9p/vfs_dentry.c

+3 −1
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ static int v9fs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) 
			retval = v9fs_refresh_inode_dotl(fid, inode);

		else

			retval = v9fs_refresh_inode(fid, inode);

		if (retval <= 0)

		if (retval == -ENOENT)

			return 0;

		if (retval < 0)

			return retval;

	}

out_valid:

fs/9p/vfs_inode_dotl.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ v9fs_vfs_follow_link_dotl(struct dentry *dentry, struct nameidata *nd) 
	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid)) {

		__putname(link);

		link = ERR_PTR(PTR_ERR(fid));

		link = ERR_CAST(fid);

		goto ndset;

	}

	retval = p9_client_readlink(fid, &target);

fs/9p/vfs_super.c

+56 −24
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
		retval = PTR_ERR(inode);

		goto release_sb;

	}



	root = d_alloc_root(inode);

	if (!root) {

		iput(inode);
@@ -185,21 +186,10 @@ static struct dentry *v9fs_mount(struct file_system_type *fs_type, int flags, 
		p9stat_free(st);

		kfree(st);

	}

	v9fs_fid_add(root, fid);

	retval = v9fs_get_acl(inode, fid);

	if (retval)

		goto release_sb;

	/*

	 * Add the root fid to session info. This is used

	 * for file system sync. We want a cloned fid here

	 * so that we can do a sync_filesystem after a

	 * shrink_dcache_for_umount

	 */

	v9ses->root_fid = v9fs_fid_clone(root);

	if (IS_ERR(v9ses->root_fid)) {

		retval = PTR_ERR(v9ses->root_fid);

		goto release_sb;

	}

	v9fs_fid_add(root, fid);



	P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");

	return dget(sb->s_root);
@@ -210,11 +200,15 @@ close_session: 
	v9fs_session_close(v9ses);

	kfree(v9ses);

	return ERR_PTR(retval);



release_sb:

	/*

	 * we will do the session_close and root dentry

	 * release in the below call.

	 * we will do the session_close and root dentry release

	 * in the below call. But we need to clunk fid, because we haven't

	 * attached the fid to dentry so it won't get clunked

	 * automatically.

	 */

	p9_client_clunk(fid);

	deactivate_locked_super(sb);

	return ERR_PTR(retval);

}
@@ -232,7 +226,7 @@ static void v9fs_kill_super(struct super_block *s) 
	P9_DPRINTK(P9_DEBUG_VFS, " %p\n", s);



	kill_anon_super(s);

	p9_client_clunk(v9ses->root_fid);



	v9fs_session_cancel(v9ses);

	v9fs_session_close(v9ses);

	kfree(v9ses);
@@ -285,14 +279,6 @@ done: 
	return res;

}



static int v9fs_sync_fs(struct super_block *sb, int wait)

{

	struct v9fs_session_info *v9ses = sb->s_fs_info;



	P9_DPRINTK(P9_DEBUG_VFS, "v9fs_sync_fs: super_block %p\n", sb);

	return p9_client_sync_fs(v9ses->root_fid);

}



static int v9fs_drop_inode(struct inode *inode)

{

	struct v9fs_session_info *v9ses;
@@ -307,6 +293,51 @@ static int v9fs_drop_inode(struct inode *inode) 
	return 1;

}



static int v9fs_write_inode(struct inode *inode,

			    struct writeback_control *wbc)

{

	int ret;

	struct p9_wstat wstat;

	struct v9fs_inode *v9inode;

	/*

	 * send an fsync request to server irrespective of

	 * wbc->sync_mode.

	 */

	P9_DPRINTK(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);

	v9inode = V9FS_I(inode);

	if (!v9inode->writeback_fid)

		return 0;

	v9fs_blank_wstat(&wstat);



	ret = p9_client_wstat(v9inode->writeback_fid, &wstat);

	if (ret < 0) {

		__mark_inode_dirty(inode, I_DIRTY_DATASYNC);

		return ret;

	}

	return 0;

}



static int v9fs_write_inode_dotl(struct inode *inode,

				 struct writeback_control *wbc)

{

	int ret;

	struct v9fs_inode *v9inode;

	/*

	 * send an fsync request to server irrespective of

	 * wbc->sync_mode.

	 */

	P9_DPRINTK(P9_DEBUG_VFS, "%s: inode %p\n", __func__, inode);

	v9inode = V9FS_I(inode);

	if (!v9inode->writeback_fid)

		return 0;

	ret = p9_client_fsync(v9inode->writeback_fid, 0);

	if (ret < 0) {

		__mark_inode_dirty(inode, I_DIRTY_DATASYNC);

		return ret;

	}

	return 0;

}



static const struct super_operations v9fs_super_ops = {

	.alloc_inode = v9fs_alloc_inode,

	.destroy_inode = v9fs_destroy_inode,
@@ -314,17 +345,18 @@ static const struct super_operations v9fs_super_ops = { 
	.evict_inode = v9fs_evict_inode,

	.show_options = generic_show_options,

	.umount_begin = v9fs_umount_begin,

	.write_inode = v9fs_write_inode,

};



static const struct super_operations v9fs_super_ops_dotl = {

	.alloc_inode = v9fs_alloc_inode,

	.destroy_inode = v9fs_destroy_inode,

	.sync_fs = v9fs_sync_fs,

	.statfs = v9fs_statfs,

	.drop_inode = v9fs_drop_inode,

	.evict_inode = v9fs_evict_inode,

	.show_options = generic_show_options,

	.umount_begin = v9fs_umount_begin,

	.write_inode = v9fs_write_inode_dotl,

};



struct file_system_type v9fs_fs_type = {