diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 16:18:14 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 16:18:14 +0200 |
commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /fs/jffs2/xattr.c | |
parent | [GFS2] Remove unused constants (diff) | |
parent | Linux v2.6.18. Arrr! (diff) | |
download | linux-91fa47964165a42401fbc1f41caa63ab78564305.tar.xz linux-91fa47964165a42401fbc1f41caa63ab78564305.zip |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/jffs2/xattr.c')
-rw-r--r-- | fs/jffs2/xattr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index 25bc1ae08648..4da09ce1d1f5 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c @@ -1215,7 +1215,6 @@ int jffs2_garbage_collect_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xatt rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XATTR_SIZE); if (rc) { JFFS2_WARNING("jffs2_reserve_space_gc()=%d, request=%u\n", rc, totlen); - rc = rc ? rc : -EBADFD; goto out; } rc = save_xattr_datum(c, xd); |