eCryptfs

Merge lp:~magicalchicken-deactivatedaccount/ecryptfs/cleaned into lp:ecryptfs

  1. cleaned
  2. Merge into trunk
Proposed by Wesley Wiedenmeier
Status: Merged
Merged at revision: 710
Proposed branch: lp:~magicalchicken-deactivatedaccount/ecryptfs/cleaned
Merge into: lp:ecryptfs
Diff against target: 31 lines (+6/-9)
1 file modified
src/utils/mount.ecryptfs.c (+6/-9)
To merge this branch: bzr merge lp:~magicalchicken-deactivatedaccount/ecryptfs/cleaned
Reviewer Review Type Date Requested Status
eCryptfs Pending
Review via email: mp+114880@code.launchpad.net

Description of the change

Removed hack that was needed to work around a kernel bug that no longer exists.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/utils/mount.ecryptfs.c'
2--- src/utils/mount.ecryptfs.c 2012-05-14 21:40:00 +0000
3+++ src/utils/mount.ecryptfs.c 2012-07-13 14:56:19 +0000
4@@ -546,10 +546,12 @@
5 int rc;
6 struct passwd *pw;
7
8- /* Nasty hack; On some systems, this need to run before we mlock.
9- * See:
10- * https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/329264
11- */
12+ rc = mlockall(MCL_FUTURE);
13+ if (rc) {
14+ fprintf(stderr, "Exiting. Unable to mlockall address space: %m\n");
15+ return -1;
16+ }
17+
18 pw = getpwuid(getuid());
19 if (!pw) {
20 fprintf(stderr, "Exiting. Unable to obtain passwd info\n");
21@@ -557,11 +559,6 @@
22 goto out;
23 }
24
25- rc = mlockall(MCL_FUTURE);
26- if (rc) {
27- fprintf(stderr, "Exiting. Unable to mlockall address space: %m\n");
28- return -1;
29- }
30 if (dump_args) {
31 int i;
32

Subscribers

People subscribed via source and target branches