diff for duplicates of <158454394013.2863966.17628947547369936858.stgit@warthog.procyon.org.uk>
diff --git a/a/1.txt b/N1/1.txt
index 307daf6..7b4a5e4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -114,7 +114,8 @@ index 3e647992be31..81d9d322b1c8 100644
+
Event Filtering
- =======@@ -302,6 +310,7 @@ It can then be set to receive notifications::
+ ===============
+@@ -302,6 +310,7 @@ It can then be set to receive notifications::
keyctl(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fds[1], 0x01);
watch_mount(AT_FDCWD, "/", 0, fds[1], 0x02);
@@ -450,7 +451,8 @@ index ececa5695fd1..0646ed54237f 100644
+ struct watch_list *wlist = NULL;
+ struct watch *watch = NULL;
+ struct path path;
-+ unsigned int lookup_flags + LOOKUP_DIRECTORY | LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
++ unsigned int lookup_flags =
++ LOOKUP_DIRECTORY | LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
+ bool drop_s_count = false;
+ int ret;
+
@@ -510,7 +512,7 @@ index ececa5695fd1..0646ed54237f 100644
+ s->s_count++;
+ spin_unlock(&sb_lock);
+ ret = add_watch_to_object(watch, s->s_watchers);
-+ if (ret = 0)
++ if (ret == 0)
+ watch = NULL; /* It worked */
+ else
+ drop_s_count = true;
diff --git a/a/content_digest b/N1/content_digest
index 5e6005b..3a0815a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -154,7 +154,8 @@
"+\n",
" \n",
" Event Filtering\n",
- " =======\@\@ -302,6 +310,7 \@\@ It can then be set to receive notifications::\n",
+ " ===============\n",
+ "\@\@ -302,6 +310,7 \@\@ It can then be set to receive notifications::\n",
" \n",
" \tkeyctl(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fds[1], 0x01);\n",
" \twatch_mount(AT_FDCWD, \"/\", 0, fds[1], 0x02);\n",
@@ -490,7 +491,8 @@
"+\tstruct watch_list *wlist = NULL;\n",
"+\tstruct watch *watch = NULL;\n",
"+\tstruct path path;\n",
- "+\tunsigned int lookup_flags +\t\tLOOKUP_DIRECTORY | LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;\n",
+ "+\tunsigned int lookup_flags =\n",
+ "+\t\tLOOKUP_DIRECTORY | LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;\n",
"+\tbool drop_s_count = false;\n",
"+\tint ret;\n",
"+\n",
@@ -550,7 +552,7 @@
"+\t\t\ts->s_count++;\n",
"+\t\t\tspin_unlock(&sb_lock);\n",
"+\t\t\tret = add_watch_to_object(watch, s->s_watchers);\n",
- "+\t\t\tif (ret = 0)\n",
+ "+\t\t\tif (ret == 0)\n",
"+\t\t\t\twatch = NULL; /* It worked */\n",
"+\t\t\telse\n",
"+\t\t\t\tdrop_s_count = true;\n",
@@ -752,4 +754,4 @@
" COND_SYSCALL(timerfd_settime);"
]
-474f16ee84ada1d6f57f021254d0d54b298ab8ad578c6c5fd46167558d6ae11c
+86776b5503ece311dcaa51ce05db1363ccd09203449d9d378505ce5ca3dd79b6
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.