summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-27 10:14:04 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-27 10:14:04 -0700
commitef49c32b8489a845a54ca4689b17bfbf8db9bf9e (patch)
tree6b347590b2ba52c9a4e6eac701bb2ecd9323a82f /fs
parent3d1343b55643d60839d711205076e75754e9126e (diff)
parent6d85d06673db74ec7ff4aa31e47b1e2e7a5af7cb (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()
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 9728614b8958..77fc5838609c 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)