diff options
author | Christoph Hellwig <hch@lst.de> | 2008-10-16 01:02:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:33 -0400 |
commit | f7a5000f7a8924e9c5fad1801616601d6dc65a17 (patch) | |
tree | 82bd7f554378b26fe23707a3755359787b252574 /arch/sparc64 | |
parent | f7ad160b49c49dc9cd383b9184c6fa4a9b4f7ebb (diff) |
compat: move cp_compat_stat to common code
struct stat / compat_stat is the same on all architectures, so
cp_compat_stat should be, too.
Turns out it is, except that various architectures have slightly and some
high2lowuid/high2lowgid or the direct assignment instead of the
SET_UID/SET_GID that expands to the correct one anyway.
This patch replaces the arch-specific cp_compat_stat implementations with
a common one based on the x86-64 one.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David S. Miller <davem@davemloft.net> [ sparc bits ]
Acked-by: Kyle McMartin <kyle@mcmartin.ca> [ parisc bits ]
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/sys_sparc32.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 3320c9d0075f..73a33dc3bcca 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -148,41 +148,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned | |||
148 | return sys_ftruncate(fd, (high << 32) | low); | 148 | return sys_ftruncate(fd, (high << 32) | low); |
149 | } | 149 | } |
150 | 150 | ||
151 | int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) | ||
152 | { | ||
153 | compat_ino_t ino; | ||
154 | int err; | ||
155 | |||
156 | if (stat->size > MAX_NON_LFS || !old_valid_dev(stat->dev) || | ||
157 | !old_valid_dev(stat->rdev)) | ||
158 | return -EOVERFLOW; | ||
159 | |||
160 | ino = stat->ino; | ||
161 | if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino) | ||
162 | return -EOVERFLOW; | ||
163 | |||
164 | err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev); | ||
165 | err |= put_user(stat->ino, &statbuf->st_ino); | ||
166 | err |= put_user(stat->mode, &statbuf->st_mode); | ||
167 | err |= put_user(stat->nlink, &statbuf->st_nlink); | ||
168 | err |= put_user(high2lowuid(stat->uid), &statbuf->st_uid); | ||
169 | err |= put_user(high2lowgid(stat->gid), &statbuf->st_gid); | ||
170 | err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev); | ||
171 | err |= put_user(stat->size, &statbuf->st_size); | ||
172 | err |= put_user(stat->atime.tv_sec, &statbuf->st_atime); | ||
173 | err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec); | ||
174 | err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime); | ||
175 | err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec); | ||
176 | err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime); | ||
177 | err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec); | ||
178 | err |= put_user(stat->blksize, &statbuf->st_blksize); | ||
179 | err |= put_user(stat->blocks, &statbuf->st_blocks); | ||
180 | err |= put_user(0, &statbuf->__unused4[0]); | ||
181 | err |= put_user(0, &statbuf->__unused4[1]); | ||
182 | |||
183 | return err; | ||
184 | } | ||
185 | |||
186 | static int cp_compat_stat64(struct kstat *stat, | 151 | static int cp_compat_stat64(struct kstat *stat, |
187 | struct compat_stat64 __user *statbuf) | 152 | struct compat_stat64 __user *statbuf) |
188 | { | 153 | { |