diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:54:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:54:04 -0700 |
| commit | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (patch) | |
| tree | 8e54da82410c8e57ff53b3d69d5760ff28bc236f /fs | |
| parent | 1547ac893acbf87738ded0b470e2735fdfba6947 (diff) | |
| parent | 2041f657aa4dc77afd63bbb34b34ed9476cf9ab9 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] partitions: fix build error in ibm partition detection code
[S390] appldata: fix dev_get_stats 64 bit conversion
[S390] wire up prlimit64 and fanotify* syscalls
[S390] zcrypt: fix Kconfig dependencies
[S390] sys_personality: follow u_long to unsigned int conversion
[S390] dasd: fix format string types
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/partitions/ibm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/ibm.c b/fs/partitions/ibm.c index d1b8a5c4bc0..d513a07f44b 100644 --- a/fs/partitions/ibm.c +++ b/fs/partitions/ibm.c @@ -182,7 +182,7 @@ int ibm_partition(struct parsed_partitions *state) offset = (info->label_block + 1); } else { /* unlabeled disk */ - strlcat(tmp, sizeof(tmp), "(nonl)", PAGE_SIZE); + strlcat(state->pp_buf, "(nonl)", PAGE_SIZE); size = i_size >> 9; offset = (info->label_block + 1); } |