git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index
fa4fa6c
..
d672250
100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-28,7
+28,7
@@
#include <linux/pagemap.h>
#include <linux/file.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/file.h>
#include <linux/mm.h>
-#include <linux/
module
.h>
+#include <linux/
export
.h>
#include <linux/swap.h>
static struct vfsmount *shm_mnt;
#include <linux/swap.h>
static struct vfsmount *shm_mnt;
@@
-2503,7
+2503,7
@@
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
d_instantiate(path.dentry, inode);
inode->i_size = size;
d_instantiate(path.dentry, inode);
inode->i_size = size;
-
inode->i_nlink = 0
; /* It is unlinked */
+
clear_nlink(inode)
; /* It is unlinked */
#ifndef CONFIG_MMU
error = ramfs_nommu_expand_for_mapping(inode, size);
if (error)
#ifndef CONFIG_MMU
error = ramfs_nommu_expand_for_mapping(inode, size);
if (error)