From 5f2703caa725d186f4bd31612a9a0e80d8f3ddaf Mon Sep 17 00:00:00 2001
From: Mike Galbraith <mgalbraith@suse.de>
Date: Wed, 28 Nov 2012 07:17:18 +0100
Subject: [PATCH] --- yaml --- r: 336179 b: refs/heads/master c:
 412d32e6c98527078779e5b515823b2810e40324 h: refs/heads/master i:   336177:
 0b228946a23e716d2d41ac1504376c23c02f1514   336175:
 d9b5b210353473121b89e0d050d3b127a9056ab5 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/cifs/readdir.c  |  5 +----
 trunk/fs/file.c          | 14 ++++++--------
 trunk/fs/namei.c         |  5 -----
 trunk/fs/nfs/dir.c       |  7 +++----
 trunk/kernel/workqueue.c |  4 +++-
 6 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 050048330eef..73be57f788d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 331fee3cd31c3ec3641062ca01a71b79dbf58b40
+refs/heads/master: 412d32e6c98527078779e5b515823b2810e40324
diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c
index 1c576e871366..f9b5d3d6cf33 100644
--- a/trunk/fs/cifs/readdir.c
+++ b/trunk/fs/cifs/readdir.c
@@ -86,17 +86,14 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,
 
 	dentry = d_lookup(parent, name);
 	if (dentry) {
-		int err;
 		inode = dentry->d_inode;
 		/* update inode in place if i_ino didn't change */
 		if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
 			cifs_fattr_to_inode(inode, fattr);
 			return dentry;
 		}
-		err = d_invalidate(dentry);
+		d_drop(dentry);
 		dput(dentry);
-		if (err)
-			return NULL;
 	}
 
 	dentry = d_alloc(parent, name);
diff --git a/trunk/fs/file.c b/trunk/fs/file.c
index eff23162485f..7cb71b992603 100644
--- a/trunk/fs/file.c
+++ b/trunk/fs/file.c
@@ -994,18 +994,16 @@ int iterate_fd(struct files_struct *files, unsigned n,
 		const void *p)
 {
 	struct fdtable *fdt;
+	struct file *file;
 	int res = 0;
 	if (!files)
 		return 0;
 	spin_lock(&files->file_lock);
-	for (fdt = files_fdtable(files); n < fdt->max_fds; n++) {
-		struct file *file;
-		file = rcu_dereference_check_fdtable(files, fdt->fd[n]);
-		if (!file)
-			continue;
-		res = f(p, file, n);
-		if (res)
-			break;
+	fdt = files_fdtable(files);
+	while (!res && n < fdt->max_fds) {
+		file = rcu_dereference_check_fdtable(files, fdt->fd[n++]);
+		if (file)
+			res = f(p, file, n);
 	}
 	spin_unlock(&files->file_lock);
 	return res;
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 5f4cdf3ad913..937f9d50c84b 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2131,11 +2131,6 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
 	if (!len)
 		return ERR_PTR(-EACCES);
 
-	if (unlikely(name[0] == '.')) {
-		if (len < 2 || (len == 2 && name[1] == '.'))
-			return ERR_PTR(-EACCES);
-	}
-
 	while (len--) {
 		c = *(const unsigned char *)name++;
 		if (c == '/' || c == '\0')
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index b9e66b7e0c14..ce8cb926526b 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -450,8 +450,7 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
 			nfs_refresh_inode(dentry->d_inode, entry->fattr);
 			goto out;
 		} else {
-			if (d_invalidate(dentry) != 0)
-				goto out;
+			d_drop(dentry);
 			dput(dentry);
 		}
 	}
@@ -1101,8 +1100,6 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
 out_zap_parent:
 	nfs_zap_caches(dir);
  out_bad:
-	nfs_free_fattr(fattr);
-	nfs_free_fhandle(fhandle);
 	nfs_mark_for_revalidate(dir);
 	if (inode && S_ISDIR(inode->i_mode)) {
 		/* Purge readdir caches. */
@@ -1115,6 +1112,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
 		shrink_dcache_parent(dentry);
 	}
 	d_drop(dentry);
+	nfs_free_fattr(fattr);
+	nfs_free_fhandle(fhandle);
 	dput(parent);
 	dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n",
 			__func__, dentry->d_parent->d_name.name,
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 042d221d33cc..ac25db111f48 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -2407,8 +2407,10 @@ static int rescuer_thread(void *__wq)
 repeat:
 	set_current_state(TASK_INTERRUPTIBLE);
 
-	if (kthread_should_stop())
+	if (kthread_should_stop()) {
+		__set_current_state(TASK_RUNNING);
 		return 0;
+	}
 
 	/*
 	 * See whether any cpu is asking for help.  Unbounded