diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-27 04:40:08 -0700 |
| commit | 15d3b4a26291c170563e2b25ded5de1324f93959 (patch) | |
| tree | 9bea548a7de5215c58a091d58f4eefdb92349f2c /fs/coda/coda_linux.c | |
| parent | 2c3abab7c95295f319dc8899b74cbd60140fcdfb (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
| download | talos-op-linux-15d3b4a26291c170563e2b25ded5de1324f93959.tar.gz talos-op-linux-15d3b4a26291c170563e2b25ded5de1324f93959.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/coda/coda_linux.c')
| -rw-r--r-- | fs/coda/coda_linux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c index e1c854890f94..bf4a3fd3c8e3 100644 --- a/fs/coda/coda_linux.c +++ b/fs/coda/coda_linux.c @@ -28,11 +28,9 @@ int coda_fake_statfs; char * coda_f2s(struct CodaFid *f) { static char s[60]; -#ifdef CONFIG_CODA_FS_OLD_API - sprintf(s, "(%08x.%08x.%08x)", f->opaque[0], f->opaque[1], f->opaque[2]); -#else + sprintf(s, "(%08x.%08x.%08x.%08x)", f->opaque[0], f->opaque[1], f->opaque[2], f->opaque[3]); -#endif + return s; } |
