The patch titled
Subject: ocfs2: add freeze protection to ocfs2_file_splice_write()
has been removed from the -mm tree. Its filename was
ocfs2-add-freeze-protection-to-ocfs2_file_splice_write.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Jan Kara <jack@xxxxxxx>
Subject: ocfs2: add freeze protection to ocfs2_file_splice_write()
ocfs2_file_splice_write() was missed when adding freeze protection to all
write paths. Fix that.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Acked-by: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Nikola Ciprich <nikola.ciprich@xxxxxxxxxxx>
Cc: Marco Stornelli <marco.stornelli@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/file.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN fs/ocfs2/file.c~ocfs2-add-freeze-protection-to-ocfs2_file_splice_write fs/ocfs2/file.c
--- a/fs/ocfs2/file.c~ocfs2-add-freeze-protection-to-ocfs2_file_splice_write
+++ a/fs/ocfs2/file.c
@@ -2469,6 +2469,9 @@ static ssize_t ocfs2_file_splice_write(s
out->f_path.dentry->d_name.len,
out->f_path.dentry->d_name.name, len);
+ if (!sb_start_file_write(out))
+ return -EAGAIN;
+
if (pipe->inode)
mutex_lock_nested(&pipe->inode->i_mutex, I_MUTEX_PARENT);
@@ -2507,6 +2510,7 @@ static ssize_t ocfs2_file_splice_write(s
balance_dirty_pages_ratelimited(mapping);
}
+ sb_end_write(inode->i_sb);
return ret;
}
_
Patches currently in -mm which might be from jack@xxxxxxx are
linux-next.patch
direct-io-fix-boundary-block-handling.patch
mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation.patch
mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix.patch
mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
