projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/amd/powerplay: incorrectly use of the function return value
[linux-2.6-block.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index e418a995427d67b4e386c366da4dd427dc27c889..24463b67b6efa5817e7c1e806d1bf6337d300ba2 100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-2227,7
+2227,7
@@
static long shmem_fallocate(struct file *file, int mode, loff_t offset,
/* Remove the !PageUptodate pages we added */
shmem_undo_range(inode,
(loff_t)start << PAGE_SHIFT,
/* Remove the !PageUptodate pages we added */
shmem_undo_range(inode,
(loff_t)start << PAGE_SHIFT,
- (
loff_t)index << PAGE_SHIFT
, true);
+ (
(loff_t)index << PAGE_SHIFT) - 1
, true);
goto undone;
}
goto undone;
}
@@
-2645,10
+2645,11
@@
static int shmem_xattr_handler_get(const struct xattr_handler *handler,
}
static int shmem_xattr_handler_set(const struct xattr_handler *handler,
}
static int shmem_xattr_handler_set(const struct xattr_handler *handler,
- struct dentry *dentry, const char *name,
- const void *value, size_t size, int flags)
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags)
{
{
- struct shmem_inode_info *info = SHMEM_I(
d_inode(dentry)
);
+ struct shmem_inode_info *info = SHMEM_I(
inode
);
name = xattr_full_name(handler, name);
return simple_xattr_set(&info->xattrs, name, value, size, flags);
name = xattr_full_name(handler, name);
return simple_xattr_set(&info->xattrs, name, value, size, flags);