diff for duplicates of <50700A58.3050609@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 74f8c2e..46e0040 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,3 +35,17 @@ index 17ae5c8..29e7971 100644 kfree(old_opts.s_qf_names[i]); #endif - unlock_super(sb); +- + if (enable_quota) + dquot_resume(sb, -1); + return 0; +@@ -2728,7 +2723,6 @@ restore_opts: + sbi->s_qf_names[i] = old_opts.s_qf_names[i]; + } + #endif +- unlock_super(sb); + return err; + } + +-- +1.7.3.4 diff --git a/a/content_digest b/N1/content_digest index 14dc2ca..0b99a01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -46,6 +46,20 @@ " \t\t old_opts.s_qf_names[i] != sbi->s_qf_names[i])\n" " \t\t\tkfree(old_opts.s_qf_names[i]);\n" " #endif\n" - "-\tunlock_super(sb);" + "-\tunlock_super(sb);\n" + "-\n" + " \tif (enable_quota)\n" + " \t\tdquot_resume(sb, -1);\n" + " \treturn 0;\n" + "@@ -2728,7 +2723,6 @@ restore_opts:\n" + " \t\tsbi->s_qf_names[i] = old_opts.s_qf_names[i];\n" + " \t}\n" + " #endif\n" + "-\tunlock_super(sb);\n" + " \treturn err;\n" + " }\n" + " \n" + "-- \n" + 1.7.3.4 -e664ae5580c6c1ce6d4d862bd70cd51993edd654970e634f970a793983a2b339 +3ec80f113b08673fcc79809613f81686fc620e44444e405675829b8b5c5b8fd6
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.