[PATCH] Documentation: Fix bad merge with tmpfile documentation

[Jeff Mahoney]

Commit 48bde8d3 (Document ->tmpfile()) had a bad merge in vfs.txt,
where it put the new tmpfile prototype in the middle of the atomic_open
prototype.

Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
---
 Documentation/filesystems/vfs.txt |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- a/Documentation/filesystems/vfs.txt	2013-07-16 00:53:43.791018403 -0400
+++ b/Documentation/filesystems/vfs.txt	2013-07-16 00:59:16.008721223 -0400
@@ -360,11 +360,10 @@ struct inode_operations {
 	int (*removexattr) (struct dentry *, const char *);
 	void (*update_time)(struct inode *, struct timespec *, int);
 	int (*atomic_open)(struct inode *, struct dentry *,
-	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
-} ____cacheline_aligned;
 				struct file *, unsigned open_flag,
 				umode_t create_mode, int *opened);
-};
+	int (*tmpfile) (struct inode *, struct dentry *, umode_t);
+} ____cacheline_aligned;

 Again, all methods are called without any locks being held, unless
 otherwise noted.

-- 
Jeff Mahoney
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/