diff --git a/[refs] b/[refs]
index 80c0c3d3cd58..3fe39d7881ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a4e922c3db06f7da27e072729e047185c2fba66
+refs/heads/master: dfca7cebc2679f3d129f8e680a8f199a7ad16e38
diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c
index dc5e64893375..2b112d978e9f 100644
--- a/trunk/fs/fuse/dir.c
+++ b/trunk/fs/fuse/dir.c
@@ -705,7 +705,14 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
 
 		spin_lock(&fc->lock);
 		fi->attr_version = ++fc->attr_version;
-		drop_nlink(inode);
+		/*
+		 * If i_nlink == 0 then unlink doesn't make sense, yet this can
+		 * happen if userspace filesystem is careless.  It would be
+		 * difficult to enforce correct nlink usage so just ignore this
+		 * condition here
+		 */
+		if (inode->i_nlink > 0)
+			drop_nlink(inode);
 		spin_unlock(&fc->lock);
 		fuse_invalidate_attr(inode);
 		fuse_invalidate_attr(dir);