FSA: Make removeEntry() take an exclusive lock

removeEntry() currently takes a shared lock to allow for removal of a
file with an open writable. Taking an exclusive lock makes the behavior
consistent with move() and remove(), the other file-altering operations.

Discussed in whatwg/fs#39

TODO: link blink-dev PSA

Fixed: 1254078
Change-Id: I5d471405d65f4d1920e7f0dfe9c783a4038e63e3

Author: a-sully

fs/script-tests/FileSystemDirectoryHandle-removeEntry.js

@@ -93,11 +93,35 @@ directory_test(async (t, root) => {
   await createFileWithContents(t, 'file-to-keep', 'abc', root);
 
   const writable = await handle.createWritable();
-  await root.removeEntry('file-to-remove');
-  await promise_rejects_dom(t, 'NotFoundError', getFileContents(handle));
+  await promise_rejects_dom(
+      t, 'NoModificationAllowedError', root.removeEntry('file-to-remove'));
 
   await writable.close();
   assert_array_equals(
       await getSortedDirectoryEntries(root),
       ['file-to-keep', 'file-to-remove']);
-}, 'removeEntry() while the file has an open writable succeeds');
+
+  await root.removeEntry('file-to-remove');
+  assert_array_equals(await getSortedDirectoryEntries(root), ['file-to-keep']);
+}, 'removeEntry() while the file has an open writable fails');
+
+directory_test(async (t, root) => {
+  const dir_name = 'dir-name';
+  const dir = await createDirectory(t, dir_name, root);
+
+  const handle =
+      await createFileWithContents(t, 'file-to-remove', '12345', dir);
+  await createFileWithContents(t, 'file-to-keep', 'abc', dir);
+
+  const writable = await handle.createWritable();
+  await promise_rejects_dom(
+      t, 'NoModificationAllowedError', root.removeEntry(dir_name));
+
+  await writable.close();
+  assert_array_equals(
+      await getSortedDirectoryEntries(dir_name),
+      ['file-to-keep', 'file-to-remove']);
+
+  await dir.removeEntry('file-to-remove');
+  assert_array_equals(await getSortedDirectoryEntries(dir), ['file-to-keep']);
+}, 'removeEntry() of a directory while a containing file has an open writable fails');

fs/script-tests/FileSystemWritableFileStream-write.js

@@ -192,17 +192,6 @@ directory_test(async (t, root) => {
   assert_equals(await getFileSize(handle), 3);
 }, 'write() with a valid typed array buffer');
 
-directory_test(async (t, root) => {
-  const dir = await createDirectory(t, 'parent_dir', root);
-  const file_name = 'close_fails_when_dir_removed.txt';
-  const handle = await createEmptyFile(t, file_name, dir);
-  const stream = await handle.createWritable();
-  await stream.write('foo');
-
-  await root.removeEntry('parent_dir', {recursive: true});
-  await promise_rejects_dom(t, 'NotFoundError', stream.close());
-}, 'atomic writes: close() fails when parent directory is removed');
-
 directory_test(async (t, root) => {
   const handle = await createEmptyFile(t, 'atomic_writes.txt', root);
   const stream = await handle.createWritable();
@@ -274,22 +263,6 @@ directory_test(async (t, root) => {
   assert_equals(success_count, 1);
 }, 'atomic writes: only one close() operation may succeed');
 
-directory_test(async (t, root) => {
-  const dir = await createDirectory(t, 'parent_dir', root);
-  const file_name = 'atomic_writable_file_stream_persists_removed.txt';
-  const handle = await createFileWithContents(t, file_name, 'foo', dir);
-
-  const stream = await handle.createWritable();
-  await stream.write('bar');
-
-  await dir.removeEntry(file_name);
-  await promise_rejects_dom(t, 'NotFoundError', getFileContents(handle));
-
-  await stream.close();
-  assert_equals(await getFileContents(handle), 'bar');
-  assert_equals(await getFileSize(handle), 3);
-}, 'atomic writes: writable file stream persists file on close, even if file is removed');
-
 directory_test(async (t, root) => {
   const handle = await createEmptyFile(t, 'writer_written', root);
   const stream = await handle.createWritable();
@@ -314,7 +287,6 @@ directory_test(async (t, root) => {
 
   await promise_rejects_dom(
       t, "SyntaxError", stream.write({type: 'truncate'}), 'truncate without size');
-
 }, 'WriteParams: truncate missing size param');
 
 directory_test(async (t, root) => {
@@ -323,7 +295,6 @@ directory_test(async (t, root) => {
 
   await promise_rejects_dom(
       t, "SyntaxError", stream.write({type: 'write'}), 'write without data');
-
 }, 'WriteParams: write missing data param');
 
 directory_test(async (t, root) => {
@@ -332,17 +303,15 @@ directory_test(async (t, root) => {
 
   await promise_rejects_js(
       t, TypeError, stream.write({type: 'write', data: null}), 'write with null data');
-
 }, 'WriteParams: write null data param');
 
 directory_test(async (t, root) => {
-  const handle = await createFileWithContents(
-      t, 'content.txt', 'seekable', root);
+  const handle =
+      await createFileWithContents(t, 'content.txt', 'seekable', root);
   const stream = await handle.createWritable();
 
   await promise_rejects_dom(
       t, "SyntaxError", stream.write({type: 'seek'}), 'seek without position');
-
 }, 'WriteParams: seek missing position param');
 
 directory_test(async (t, root) => {

fs/script-tests/FileSystemWritableFileStream.js

@@ -31,26 +31,6 @@ directory_test(async (t, root) => {
   await promise_rejects_dom(t, 'NotFoundError', handle.createWritable());
 }, 'createWritable() fails when parent directory is removed');
 
-directory_test(async (t, root) => {
-  const dir = await createDirectory(t, 'parent_dir', root);
-  const file_name = 'write_fails_when_dir_removed.txt';
-  const handle = await createEmptyFile(t, file_name, dir);
-  const stream = await handle.createWritable();
-
-  await root.removeEntry('parent_dir', {recursive: true});
-  await promise_rejects_dom(t, 'NotFoundError', stream.write('foo'));
-}, 'write() fails when parent directory is removed');
-
-directory_test(async (t, root) => {
-  const dir = await createDirectory(t, 'parent_dir', root);
-  const file_name = 'truncate_fails_when_dir_removed.txt';
-  const handle = await createEmptyFile(t, file_name, dir);
-  const stream = await handle.createWritable();
-
-  await root.removeEntry('parent_dir', {recursive: true});
-  await promise_rejects_dom(t, 'NotFoundError', stream.truncate(0));
-}, 'truncate() fails when parent directory is removed');
-
 directory_test(async (t, root) => {
   const handle = await createFileWithContents(
       t, 'atomic_file_is_copied.txt', 'fooks', root);