13 Apr, 2014
2 commits
-
The vfs merge caused a latent bug to show up:
In file included from fs/ceph/super.h:4:0,
from fs/ceph/ioctl.c:3:
include/linux/ceph/ceph_debug.h:4:0: warning: "pr_fmt" redefined [enabled by default]
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
^
In file included from include/linux/kernel.h:13:0,
from include/linux/uio.h:12,
from include/linux/socket.h:7,
from include/uapi/linux/in.h:22,
from include/linux/in.h:23,
from fs/ceph/ioctl.c:1:
include/linux/printk.h:214:0: note: this is the location of the previous definition
#define pr_fmt(fmt) fmt
^where the reason is that is included much too late
for the "pr_fmt()" define.The include of needs to be the first include in the
file, but fs/ceph/ioctl.c had for some reason missed that, and it wasn't
noticeable until some unrelated header file changes brought in an
indirect earlier include of .Signed-off-by: Linus Torvalds
-
Pull vfs updates from Al Viro:
"The first vfs pile, with deep apologies for being very late in this
window.Assorted cleanups and fixes, plus a large preparatory part of iov_iter
work. There's a lot more of that, but it'll probably go into the next
merge window - it *does* shape up nicely, removes a lot of
boilerplate, gets rid of locking inconsistencie between aio_write and
splice_write and I hope to get Kent's direct-io rewrite merged into
the same queue, but some of the stuff after this point is having
(mostly trivial) conflicts with the things already merged into
mainline and with some I want more testing.This one passes LTP and xfstests without regressions, in addition to
usual beating. BTW, readahead02 in ltp syscalls testsuite has started
giving failures since "mm/readahead.c: fix readahead failure for
memoryless NUMA nodes and limit readahead pages" - might be a false
positive, might be a real regression..."* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
missing bits of "splice: fix racy pipe->buffers uses"
cifs: fix the race in cifs_writev()
ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
kill generic_file_buffered_write()
ocfs2_file_aio_write(): switch to generic_perform_write()
ceph_aio_write(): switch to generic_perform_write()
xfs_file_buffered_aio_write(): switch to generic_perform_write()
export generic_perform_write(), start getting rid of generic_file_buffer_write()
generic_file_direct_write(): get rid of ppos argument
btrfs_file_aio_write(): get rid of ppos
kill the 5th argument of generic_file_buffered_write()
kill the 4th argument of __generic_file_aio_write()
lustre: don't open-code kernel_recvmsg()
ocfs2: don't open-code kernel_recvmsg()
drbd: don't open-code kernel_recvmsg()
constify blk_rq_map_user_iov() and friends
lustre: switch to kernel_sendmsg()
ocfs2: don't open-code kernel_sendmsg()
take iov_iter stuff to mm/iov_iter.c
process_vm_access: tidy up a bit
...
12 Apr, 2014
1 commit
-
ceph_osdc_put_request(ERR_PTR(-error)) oopses. What we want there
is break, not goto out.Signed-off-by: Al Viro
07 Apr, 2014
1 commit
-
skip dentries that were added before MDS issued FILE_SHARED to
client.Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil
05 Apr, 2014
14 commits
-
Signed-off-by: Yan, Zheng
-
Signed-off-by: Yan, Zheng
-
ceph_atomic_open() calls ceph_open() after receiving the MDS reply.
ceph_open() grabs an extra open file reference. (The open request
already holds an open file reference)Signed-off-by: Yan, Zheng
-
Preallocate buffer for readdir reply. Limit number of entries in
readdir reply according to the buffer size.Signed-off-by: Yan, Zheng
-
This avoids 'cp -a' modifying layout of new files/directories.
Signed-off-by: Yan, Zheng
-
If buffer size is zero, return the size of layout vxattr. If buffer
size is not zero, check if it is large enough for layout vxattr.Signed-off-by: Yan, Zheng
-
send_mds_reconnect() may call discard_cap_releases() after all
release messages have been dropped by cleanup_cap_releases()Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
Remove unsupported symlink operations.
Signed-off-by: Fabian Frederick
Signed-off-by: Ilya Dryomov -
When adjusting caps client wants, MDS does not record caps that are
not allowed. For non-auth MDS, it does not record WR caps. So when
a MDS reply changes a non-auth cap to auth cap, client needs to set
cap's mds_wanted according to the reply.Signed-off-by: Yan, Zheng
-
flock and posix lock should use fl->fl_file instead of process ID
as owner identifier. (posix lock uses fl->fl_owner. fl->fl_owner
is usually equal to fl->fl_file, but it also can be a customized
value). The process ID of who holds the lock is just for F_GETLK
fcntl(2).The fix is rename the 'pid' fields of struct ceph_mds_request_args
and struct ceph_filelock to 'owner', rename 'pid_namespace' fields
to 'pid'. Assign fl->fl_file to the 'owner' field of lock messages.
We also set the most significant bit of the 'owner' field. MDS can
use that bit to distinguish between old and new clients.The MDS counterpart of this patch modifies the flock code to not
take the 'pid_namespace' into consideration when checking conflict
locks.Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
Signed-off-by: Yan, Zheng
-
VFS does not directly pass flock's operation code to filesystem's
flock callback. It translates the operation code to the form how
posix lock's parameters are presented.Signed-off-by: Yan, Zheng
-
handle following sequence of events:
- client releases a inode with i_max_size > 0. The release message
is queued. (is not sent to the auth MDS)
- a 'lookup' request reply from non-auth MDS returns the same inode.
- client opens the inode in write mode. The version of inode trace
in 'open' request reply is equal to the cached inode's version.
- client requests new max size. The MDS ignores the request because
it does not affect client's write rangeSigned-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
Only auth MDS can issue write caps to clients, so don't consider
write caps registered with non-auth MDS as valid.Signed-off-by: Yan, Zheng
03 Apr, 2014
15 commits
-
Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
Use the newly introduced LOOKUPNAME MDS request to connect child
inode to its parent directory.Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
ceph_fh_to_parent() returns dentry that corresponds to the 'ino' field
of struct ceph_nfs_confh. This is wrong, it should return dentry that
corresponds to the 'parent_ino' field.Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
The callback uses LOOKUPPARENT MDS request to find parent.
Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
MDS handles LOOKUPHASH and LOOKUPINO MDS requests in the same way.
So __cfh_to_dentry() is redundant.Signed-off-by: Yan, Zheng
Reviewed-by: Sage Weil -
The object store limit needs to be updated after writing,
and this can be done provided the corresponding object has already
been initialized. Current object initialization is done asynchrously,
which introduce a race if a file is opened, then immediately followed
by a writing, the initialization may have not completed, the code will
reach the ASSERT in fscache_submit_exclusive_op() to cause kernel
bug.Tested-by: Milosz Tanski
Signed-off-by: Yunchuan Wen
Signed-off-by: Min Chen
Signed-off-by: Li Wang -
Synchronize object->store_limit[_l] with new inode->i_size after file writing.
Tested-by: Milosz Tanski
Signed-off-by: Yunchuan Wen
Signed-off-by: Min Chen
Signed-off-by: Li Wang -
Add an interface to explicitly synchronize object->store_limit[_l]
with inode->i_sizeTested-by: Milosz Tanski
Signed-off-by: Yunchuan Wen
Signed-off-by: Min Chen
Signed-off-by: Li Wang -
This is racy--we do not know whather d_parent has changed out from
underneath us because i_mutex is not held on the source inode's directory.Also, taking this reference is useless.
Reported-by: Al Viro
Signed-off-by: Sage Weil
Reviewed-by: Yan, Zheng -
Do not assume that r_old_dentry implies that r_old_dentry_dir is also
true. Separate out the ref cleanup and make the debugs dump behave when
it is NULL.Signed-off-by: Sage Weil
Reviewed-by: Yan, Zheng -
The fsync(dirfd) only covers namespace operations, not inode updates.
We do not need to cover setattr variants or O_TRUNC.Reported-by: Al Viro
Signed-off-by: Sage Weil
Reviewed-by: Yan, Zheng -
This is just old_dir; no reason to abuse the dcache pointers.
Reported-by: Al Viro
Signed-off-by: Sage Weil
Reviewed-by: Yan, Zheng -
If readdir 'frag' is adjusted, readdir 'offset' should be reset.
Otherwise some dentries may be lost when readdir and fragmenting
directory happen at the some.Another way to fix this issue is let MDS adjust readdir 'frag'.
The code that handles MDS reply reset the readdir 'offset' if
the readdir reply is different than the requested one.Signed-off-by: Yan, Zheng
-
When changing readdir postion, fi->next_offset should be set to 0
if the new postion is not in the first dirfrag.Signed-off-by: Yan, Zheng
Reviewed-by: Alex Elder -
Comparing offset with inode->i_sb->s_maxbytes doesn't make sense for
directory. For a fragmented directory, offset (frag_t, off) can be
larger than inode->i_sb->s_maxbytes.At the very beginning of ceph_dir_llseek(), local variable old_offset
is initialized to parameter offset. This doesn't make sense neither.
Old_offset should be ceph_make_fpos(fi->frag, fi->next_offset).Signed-off-by: Yan, Zheng
Reviewed-by: Alex Elder
02 Apr, 2014
2 commits
-
Signed-off-by: Al Viro
-
same story - it's &iocb->ki_pos in all cases
Signed-off-by: Al Viro
18 Feb, 2014
5 commits
-
If directory is fragmented, readdir() read its dirfrags one by one.
After reading all dirfrags, the corresponding dentries are sorted in
(frag_t, off) order in the dcache. If dentries of a directory are all
cached, __dcache_readdir() can use the cached dentries to satisfy
readdir syscall. But when checking if a given dentry is after the
position of readdir, __dcache_readdir() compares numerical value of
frag_t directly. This is wrong, it should use ceph_frag_compare().Signed-off-by: Yan, Zheng
-
Make the 'acl' option dependent on having ACL support compiled in. Make
the 'noacl' option work even without it so that one can always ask it to
be off and not error out on mount when it is not supported.Signed-off-by: Guangliang Zhao
Signed-off-by: Sage Weil -
Signed-off-by: Guangliang Zhao
Reviewed-by: Alex Elder
Signed-off-by: Sage Weil -
Signed-off-by: Yan, Zheng
-
If acl is equivalent to file mode permission bits, ceph_set_acl()
needs to remove any existing acl xattr. Use __ceph_setxattr() to
handle both setting and removing acl xattr cases, it doesn't return
-ENODATA when there is no acl xattr.Signed-off-by: Yan, Zheng
