summaryrefslogtreecommitdiffstats
path: root/fs/sysv/dir.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-09 02:05:18 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-09 02:05:18 +0200
commit44b56603c4c476b845a824cff6fe905c6268b2a1 (patch)
treeb7e792414fef2390718a657765719fbbb529ce84 /fs/sysv/dir.c
parentnfsd4: shut down callback queue outside state lock (diff)
parentnfsd: nfsd_setattr needs to call commit_metadata (diff)
downloadlinux-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz
linux-44b56603c4c476b845a824cff6fe905c6268b2a1.zip
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'fs/sysv/dir.c')
-rw-r--r--fs/sysv/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 4e50286a4cc3..1dabed286b4c 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -164,8 +164,8 @@ struct sysv_dir_entry *sysv_find_entry(struct dentry *dentry, struct page **res_
name, de->name))
goto found;
}
+ dir_put_page(page);
}
- dir_put_page(page);
if (++n >= npages)
n = 0;