ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()

Both ext3 and ext4 put the half-created symlink inode into the orphan list
for a while (see the comment in ext[34]_symlink() for gory details).  Then,
if everything went fine, they pull it out of the orphan list and bump the
link count back to 1.  The thing is, inc_nlink() is going to complain about
seeing somebody changing i_nlink from 0 to 1.  With a good reason, since
normally something like that is a bug.  Explicit set_nlink(inode, 1) does
the same thing as inc_nlink() here, but it does *not* complain - exactly
because it should be usable in strange situations like this one.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 4f35b2f315d4c8ee758ed91cf7479e672ad26c03..d269821203fda949f998c0310bad7c4afe12b32f 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2272,7 +2272,7 @@ retry:
                        err = PTR_ERR(handle);
                        goto err_drop_inode;
                }
-               inc_nlink(inode);
+               set_nlink(inode, 1);
                err = ext3_orphan_del(handle, inode);
                if (err) {
                        ext3_journal_stop(handle);

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 86edc45b52a48d6025b61f17a28368f7ed94f5bb..2043f482375d000c517093f844ed2ce873802a0e 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2315,7 +2315,7 @@ retry:
                        err = PTR_ERR(handle);
                        goto err_drop_inode;
                }
-               inc_nlink(inode);
+               set_nlink(inode, 1);
                err = ext4_orphan_del(handle, inode);
                if (err) {
                        ext4_journal_stop(handle);