diff options
| author | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
| commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
| tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /fs | |
| parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
| download | powerpc-ddae9c2ea79449beb00027cf77fca6dc489f2d15.tar.gz | |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/afs/cmservice.c | 2 | ||||
| -rw-r--r-- | fs/attr.c | 1 | ||||
| -rw-r--r-- | fs/binfmt_elf.c | 8 | ||||
| -rw-r--r-- | fs/ext2/dir.c | 2 | ||||
| -rw-r--r-- | fs/proc/vmcore.c | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 1 |
6 files changed, 6 insertions, 9 deletions
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index 0a57fd7c726f75..9eef6bf156ab5a 100644 --- a/fs/afs/cmservice.c +++ b/fs/afs/cmservice.c @@ -118,7 +118,7 @@ static int kafscmd(void *arg) _SRXAFSCM_xxxx_t func; int die; - printk("kAFS: Started kafscmd %d\n", current->pid); + printk(KERN_INFO "kAFS: Started kafscmd %d\n", current->pid); daemonize("kafscmd"); diff --git a/fs/attr.c b/fs/attr.c index b34732506f1dcf..d63e5096f2f2f2 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -14,7 +14,6 @@ #include <linux/fcntl.h> #include <linux/quotaops.h> #include <linux/security.h> -#include <linux/time.h> /* Taken over from the old code... */ diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index a4f6f57d91aa43..f979ebbce49c99 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1634,17 +1634,17 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file) ELF_CORE_WRITE_EXTRA_DATA; #endif - if ((off_t) file->f_pos != offset) { + if ((off_t)file->f_pos != offset) { /* Sanity check */ - printk("elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", - (off_t) file->f_pos, offset); + printk(KERN_WARNING "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", + (off_t)file->f_pos, offset); } end_coredump: set_fs(fs); cleanup: - while(!list_empty(&thread_list)) { + while (!list_empty(&thread_list)) { struct list_head *tmp = thread_list.next; list_del(tmp); kfree(list_entry(tmp, struct elf_thread_status, list)); diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 5b5f52876b427f..7442bdd1267a48 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -592,7 +592,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) goto fail; } kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr, 0, chunk_size); + memset(kaddr, 0, chunk_size); de = (struct ext2_dir_entry_2 *)kaddr; de->name_len = 1; de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1)); diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 5378d7c78419cd..124e35442ac8b8 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -14,7 +14,6 @@ #include <linux/a.out.h> #include <linux/elf.h> #include <linux/elfcore.h> -#include <linux/proc_fs.h> #include <linux/highmem.h> #include <linux/bootmem.h> #include <linux/init.h> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 5c6d873e292ca4..788917f355c4a7 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -40,7 +40,6 @@ #include "xfs_ialloc.h" #include "xfs_btree.h" #include "xfs_bmap.h" -#include "xfs_bit.h" #include "xfs_rtalloc.h" #include "xfs_error.h" #include "xfs_itable.h" |