diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /fs/quota/quota_v2.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'fs/quota/quota_v2.c')
| -rw-r--r-- | fs/quota/quota_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c index 65444d29406b..f1ab3604db5a 100644 --- a/fs/quota/quota_v2.c +++ b/fs/quota/quota_v2.c | |||
| @@ -112,7 +112,7 @@ static int v2_read_file_info(struct super_block *sb, int type) | |||
| 112 | if (!info->dqi_priv) { | 112 | if (!info->dqi_priv) { |
| 113 | printk(KERN_WARNING | 113 | printk(KERN_WARNING |
| 114 | "Not enough memory for quota information structure.\n"); | 114 | "Not enough memory for quota information structure.\n"); |
| 115 | return -1; | 115 | return -ENOMEM; |
| 116 | } | 116 | } |
| 117 | qinfo = info->dqi_priv; | 117 | qinfo = info->dqi_priv; |
| 118 | if (version == 0) { | 118 | if (version == 0) { |