diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:14:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:14:04 -0700 |
| commit | ef49c32b8489a845a54ca4689b17bfbf8db9bf9e (patch) | |
| tree | 6b347590b2ba52c9a4e6eac701bb2ecd9323a82f | |
| parent | 3d1343b55643d60839d711205076e75754e9126e (diff) | |
| parent | 6d85d06673db74ec7ff4aa31e47b1e2e7a5af7cb (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[JFFS2] Update MAINTAINERS entry -- the jffs-dev list is dead
[JFFS2] Prevent return of initialised variable in jffs2_init_acl_post()
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | fs/jffs2/acl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5b454627f21..231bda28c42 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2129,8 +2129,8 @@ S: Maintained JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) P: David Woodhouse M: dwmw2@infradead.org -L: jffs-dev@axis.com -W: http://sources.redhat.com/jffs2/ +L: linux-mtd@lists.infradead.org +W: http://www.linux-mtd.infradead.org/doc/jffs2.html S: Maintained JFS FILESYSTEM diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c index 9728614b895..77fc5838609 100644 --- a/fs/jffs2/acl.c +++ b/fs/jffs2/acl.c @@ -372,7 +372,7 @@ int jffs2_init_acl_post(struct inode *inode) return rc; } - return rc; + return 0; } void jffs2_clear_acl(struct jffs2_inode_info *f) |