linux-kernel - linux-next: manual merge of the logfs tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 1 Nov 2011 14:10:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Prasad Joshi <prasadjoshi.linux@...il.com>,
	"Jörn Engel" <joern@...fs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Josef Bacik <josef@...hat.com>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the logfs tree with Linus' tree

Hi all,

Today's linux-next merge of the logfs tree got a conflict in
fs/logfs/file.c between commit 02c24a82187d ("fs: push i_mutex and
filemap_write_and_wait down into ->fsync() handlers") from Linus' tree
and commit 39da12ef4bbe ("logfs: take write mutex lock during fsync and
sync") from the logfs tree.

I have no idea what needs to be done here.  I fixed it like below to make
it build, but a better fix is needed.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc fs/logfs/file.c
index b548c87,f85d603..0000000
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@@ -219,20 -219,13 +219,22 @@@ long logfs_ioctl(struct file *file, uns
  	}
  }
  
 -int logfs_fsync(struct file *file, int datasync)
 +int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
  {
  	struct super_block *sb = file->f_mapping->host->i_sb;
 +	struct inode *inode = file->f_mapping->host;
 +	int ret;
 +
 +	ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
 +	if (ret)
 +		return ret;
  
 +	mutex_lock(&inode->i_mutex);
+ 	logfs_get_wblocks(sb, NULL, WF_LOCK);
  	logfs_write_anchor(sb);
+ 	logfs_put_wblocks(sb, NULL, WF_LOCK);
 +	mutex_unlock(&inode->i_mutex);
 +
  	return 0;
  }
  

Content of type "application/pgp-signature" skipped