Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

3 files changed, 12 insertions, 12 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 0c9de19a1633..beaa0ce3b82e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -3066,7 +3066,6 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
         int retval = -ENOENT;
         ino_t ino;
         int tid;
-        unsigned long pos = filp->f_pos;  /* avoiding "long long" filp->f_pos */
         struct pid_namespace *ns;
 
         task = get_proc_task(inode);
@@ -3083,18 +3082,18 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
                 goto out_no_task;
         retval = 0;
 
-        switch (pos) {
+        switch ((unsigned long)filp->f_pos) {
         case 0:
                 ino = inode->i_ino;
-                if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0)
+                if (filldir(dirent, ".", 1, filp->f_pos, ino, DT_DIR) < 0)
                         goto out;
-                pos++;
+                filp->f_pos++;
                 /* fall through */
         case 1:
                 ino = parent_ino(dentry);
-                if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0)
+                if (filldir(dirent, "..", 2, filp->f_pos, ino, DT_DIR) < 0)
                         goto out;
-                pos++;
+                filp->f_pos++;
                 /* fall through */
         }
 
@@ -3104,9 +3103,9 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
         ns = filp->f_dentry->d_sb->s_fs_info;
         tid = (int)filp->f_version;
         filp->f_version = 0;
-        for (task = first_tid(leader, tid, pos - 2, ns);
+        for (task = first_tid(leader, tid, filp->f_pos - 2, ns);
              task;
-             task = next_tid(task), pos++) {
+             task = next_tid(task), filp->f_pos++) {
                 tid = task_pid_nr_ns(task, ns);
                 if (proc_task_fill_cache(filp, dirent, filldir, task, tid) < 0) {
                         /* returning this tgid failed, save it as the first
@@ -3117,7 +3116,6 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
                 }
         }
 out:
-        filp->f_pos = pos;
         put_task_struct(leader);
 out_no_task:
         return retval;
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 3e76bb9b3ad6..d8bb5c671f42 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -485,8 +485,10 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
                         }
                 }
                 unlock_new_inode(inode);
-        } else
+        } else {
                module_put(de->owner);
+               de_put(de);
+        }
         return inode;
 
 out_ino:
diff --git a/fs/proc/page.c b/fs/proc/page.c
index 767d95a6d1b1..e9983837d08d 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -80,7 +80,7 @@ static const struct file_operations proc_kpagecount_operations = {
 #define KPF_RECLAIM    9
 #define KPF_BUDDY     10
 
-#define kpf_copy_bit(flags, srcpos, dstpos) (((flags >> srcpos) & 1) << dstpos)
+#define kpf_copy_bit(flags, dstpos, srcpos) (((flags >> srcpos) & 1) << dstpos)
 
 static ssize_t kpageflags_read(struct file *file, char __user *buf,
                              size_t count, loff_t *ppos)
@@ -107,7 +107,7 @@ static ssize_t kpageflags_read(struct file *file, char __user *buf,
                 else
                         kflags = ppage->flags;
 
-                uflags = kpf_copy_bit(KPF_LOCKED, PG_locked, kflags) |
+                uflags = kpf_copy_bit(kflags, KPF_LOCKED, PG_locked) |
                         kpf_copy_bit(kflags, KPF_ERROR, PG_error) |
                         kpf_copy_bit(kflags, KPF_REFERENCED, PG_referenced) |
                         kpf_copy_bit(kflags, KPF_UPTODATE, PG_uptodate) |