Commit db5867af authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.ninka.net:/disk1/davem/BK/net-2.5

into hera.kernel.org:/home/davem/BK/net-2.5
parents 9f42c3ff a9c055ad
......@@ -47,13 +47,17 @@ SECTIONS
.fixup : { *(.fixup) }
__ex_table : {
__start___ex_table = .;
__ex_table : { *(__ex_table) }
*(__ex_table)
__stop___ex_table = .;
}
__bug_table : {
__start___bug_table = .;
__bug_table : { *(__bug_table) }
*(__bug_table)
__stop___bug_table = .;
}
/* Read-write section, merged into data segment: */
. = ALIGN(4096);
......
......@@ -1368,7 +1368,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
nfsd_sync_dir(tdentry);
nfsd_sync_dir(fdentry);
}
dput(ndentry);
out_dput_new:
dput(ndentry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment